From 1f05445a24fc19ef2916af60d18c015aec0eb081 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 22 Apr 2010 12:04:42 +0200 Subject: [PATCH] readline: move so symlink into main pkg. --HG-- extra : convert_revision : 8bf05a2357e39907f467f0114855aa07986b48cc --- srcpkgs/readline/readline-devel.template | 10 +++++----- srcpkgs/readline/template | 8 ++++++-- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/srcpkgs/readline/readline-devel.template b/srcpkgs/readline/readline-devel.template index 0de6605a66..7bf9ccd324 100644 --- a/srcpkgs/readline/readline-devel.template +++ b/srcpkgs/readline/readline-devel.template @@ -5,15 +5,15 @@ long_desc="${long_desc} This package contains files for development, headers, static libs, etc." -revision=1 +revision=2 Add_dependency run glibc-devel Add_dependency run readline do_install() { - mkdir -p ${DESTDIR} - mv ${SRCPKGDESTDIR}/usr ${DESTDIR} - cd ${DESTDIR}/usr/lib && \ - ln -s ../../lib/libreadline.so.6 libreadline.so + mkdir -p ${DESTDIR}/usr/lib + mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr + mv ${SRCPKGDESTDIR}/usr/share ${DESTDIR}/usr + mv ${SRCPKGDESTDIR}/usr/lib/*.a ${DESTDIR}/usr/lib } diff --git a/srcpkgs/readline/template b/srcpkgs/readline/template index 83aecf6d4b..1e06f50a77 100644 --- a/srcpkgs/readline/template +++ b/srcpkgs/readline/template @@ -3,7 +3,7 @@ pkgname=readline _dist_ver=6.1 _patch_ver=001 version=${_dist_ver}.${_patch_ver} -revision=1 +revision=2 wrksrc=${pkgname}-${_dist_ver} distfiles="http://ftp.gnu.org/gnu/readline/${pkgname}-${_dist_ver}.tar.gz" build_style=gnu_configure @@ -52,5 +52,9 @@ post_install() mkdir -p ${DESTDIR}/lib mv ${DESTDIR}/usr/lib/lib*.so.* ${DESTDIR}/lib chmod 755 ${DESTDIR}/lib/*.so* - rm -f ${DESTDIR}/usr/lib/lib*.so + rm -f ${DESTDIR}/usr/lib/*.so + for f in history readline; do + cd ${DESTDIR}/usr/lib && \ + ln -s ../../lib/lib${f}.so.6 lib${f}.so + done }