diff --git a/srcpkgs/libnsbmp/libnsbmp-devel.template b/srcpkgs/libnsbmp/libnsbmp-devel.template index 41be0ed257c..d769c31f000 100644 --- a/srcpkgs/libnsbmp/libnsbmp-devel.template +++ b/srcpkgs/libnsbmp/libnsbmp-devel.template @@ -1,5 +1,6 @@ # Template file for 'libnsbmp-devel'. # +revision=1 short_desc="${sourcepkg} development files" long_desc="${long_desc} @@ -8,14 +9,7 @@ long_desc="${long_desc} Add_dependency run libnsbmp 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}/libnsbmp.pc.in \ - > ${DESTDIR}/usr/lib/pkgconfig/libnsbmp.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/libnsbmp/libnsbmp.rshlibs b/srcpkgs/libnsbmp/libnsbmp.rshlibs new file mode 100644 index 00000000000..631aa1dda40 --- /dev/null +++ b/srcpkgs/libnsbmp/libnsbmp.rshlibs @@ -0,0 +1 @@ +libc.so.6 diff --git a/srcpkgs/libnsbmp/template b/srcpkgs/libnsbmp/template index 61eeca858d5..284d35871e0 100644 --- a/srcpkgs/libnsbmp/template +++ b/srcpkgs/libnsbmp/template @@ -1,6 +1,7 @@ # Template build file for 'libnsbmp'. pkgname=libnsbmp version=0.0.3 +revision=1 distfiles="http://www.netsurf-browser.org/projects/releases/${pkgname}-${version}-src.tar.gz" short_desc="Decoding library for BMP and ICO images in C." maintainer="davehome " @@ -21,10 +22,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/libnsbmp.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 }