diff --git a/srcpkgs/libtool/libltdl-devel.template b/srcpkgs/libtool/libltdl-devel.template deleted file mode 100644 index 3f8abe6082a..00000000000 --- a/srcpkgs/libtool/libltdl-devel.template +++ /dev/null @@ -1,11 +0,0 @@ -# Template file for 'libltdl-devel'. -# -depends="libltdl>=${version}" -short_desc="GNU Libtool Dynamic Module Loader development files" - -do_install() { - vmove usr/include usr - vmove "usr/lib/*.a" usr/lib - vmove usr/share/aclocal/ltdl.m4 usr/share/aclocal - vmove usr/share/libtool/libltdl usr/share/libtool -} diff --git a/srcpkgs/libtool/libltdl.template b/srcpkgs/libtool/libltdl.template deleted file mode 100644 index 371968cda6e..00000000000 --- a/srcpkgs/libtool/libltdl.template +++ /dev/null @@ -1,8 +0,0 @@ -# Template file for 'libltdl'. -# -short_desc="Runtime libraries for GNU Libtool Dynamic Module Loader" -replaces="libtool-ltdl>=0" - -do_install() { - vmove "usr/lib/libltdl.so*" usr/lib -} diff --git a/srcpkgs/libtool/template b/srcpkgs/libtool/template index cc25f3392c9..7e06f290e42 100644 --- a/srcpkgs/libtool/template +++ b/srcpkgs/libtool/template @@ -2,10 +2,7 @@ pkgname=libtool version=2.4.2 revision=6 -noarch=yes -depends="tar sed" hostmakedepends="perl automake help2man" -subpackages="libltdl libltdl-devel" build_style=gnu-configure homepage="http://www.gnu.org/software/libtool" distfiles="http://ftp.gnu.org/pub/gnu/libtool/$pkgname-$version.tar.xz" @@ -17,3 +14,30 @@ checksum=1d7b6862c1ed162e327f083a6f78f40eae29218f0db8c38393d61dab764c4407 pre_configure() { ./bootstrap } + +libltdl-devel_package() { + depends="libltdl>=${version}" + short_desc="GNU Libtool Dynamic Module Loader development files" + pkg_install() { + vmove usr/include + vmove "usr/lib/*.a" + vmove usr/share/aclocal/ltdl.m4 + vmove usr/share/libtool/libltdl + } +} + +libltdl_package() { + short_desc="Runtime libraries for GNU Libtool Dynamic Module Loader" + replaces="libtool-ltdl>=0" + pkg_install() { + vmove "usr/lib/libltdl.so*" + } +} + +libtool_package() { + noarch=yes + depends="tar sed" + pkg_install() { + vmove usr + } +}