From 6d6a68fc383692d44eed102c74a06991ac0bf5aa Mon Sep 17 00:00:00 2001 From: davehome Date: Thu, 23 Feb 2012 12:25:00 -0700 Subject: [PATCH] libnsgif: fix to build/install properly. --- srcpkgs/libnsgif/libnsgif-devel.template | 14 ++++---------- srcpkgs/libnsgif/libnsgif.rshlibs | 1 + srcpkgs/libnsgif/template | 10 +++++++--- 3 files changed, 12 insertions(+), 13 deletions(-) create mode 100644 srcpkgs/libnsgif/libnsgif.rshlibs diff --git a/srcpkgs/libnsgif/libnsgif-devel.template b/srcpkgs/libnsgif/libnsgif-devel.template index ab0178a128..5a5ecfcb94 100644 --- a/srcpkgs/libnsgif/libnsgif-devel.template +++ b/srcpkgs/libnsgif/libnsgif-devel.template @@ -1,5 +1,6 @@ # Template file for 'libnsgif-devel'. # +revision=1 short_desc="${sourcepkg} development files" long_desc="${long_desc} @@ -8,14 +9,7 @@ long_desc="${long_desc} Add_dependency run libnsgif do_install() { - mkdir -p ${DESTDIR}/usr/lib/pkgconfig - - sed -e 's#PREFIX#/usr#' -e 's#MAJOR#0#' \ - -e 's#MINOR#0#' -e 's#PATCH#3#' \ - -e 's#VERSION#0.0.3#' -e 's#REQUIRED##' \ - ${wrksrc}/libnsgif.pc.in \ - > ${DESTDIR}/usr/lib/pkgconfig/libnsgif.pc - - - mv ${wrksrc}/include ${DESTDIR}/usr + vmove usr/include usr + vmove usr/lib/pkgconfig usr/lib + vmove "usr/lib/*.a" usr/lib } diff --git a/srcpkgs/libnsgif/libnsgif.rshlibs b/srcpkgs/libnsgif/libnsgif.rshlibs new file mode 100644 index 0000000000..631aa1dda4 --- /dev/null +++ b/srcpkgs/libnsgif/libnsgif.rshlibs @@ -0,0 +1 @@ +libc.so.6 diff --git a/srcpkgs/libnsgif/template b/srcpkgs/libnsgif/template index 6cec3d7c2b..edc220a15c 100644 --- a/srcpkgs/libnsgif/template +++ b/srcpkgs/libnsgif/template @@ -1,6 +1,7 @@ # Template build file for 'libnsgif'. pkgname=libnsgif version=0.0.3 +revision=1 distfiles="http://www.netsurf-browser.org/projects/releases/${pkgname}-${version}-src.tar.gz" short_desc="Decoding library for the GIF image file format, written in C." maintainer="davehome " @@ -20,10 +21,13 @@ wrksrc=${pkgname}-${version}-src Add_dependency build sed do_build() { - make ${makejobs} + make ${makejobs} COMPONENT_TYPE=lib-shared + make ${makejobs} COMPONENT_TYPE=lib-static } do_install() { - vinstall "build-Linux-Linux-release-lib-static/libnsgif.a" \ - 0644 "usr/lib" + make ${makejobs} COMPONENT_TYPE=lib-shared \ + DESTDIR=${DESTDIR} PREFIX=/usr install + make ${makejobs} COMPONENT_TYPE=lib-static \ + DESTDIR=${DESTDIR} PREFIX=/usr install }