From 26c001f582b5e306e4d09b6cba2e90ef99ab751e Mon Sep 17 00:00:00 2001 From: Juan RP Date: Tue, 30 Sep 2008 18:58:04 +0200 Subject: [PATCH] Pass some more args to gnu configure scripts to get the correct dirs and remove specific hacks from templates. --HG-- extra : convert_revision : 3abbceb03c42e5d38bfae226ee433f2461b77ce7 --- pkgfs.sh | 2 ++ templates/libidn-1.9.tmpl | 3 +-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgfs.sh b/pkgfs.sh index 398c78cfaf2..270631ae4b1 100755 --- a/pkgfs.sh +++ b/pkgfs.sh @@ -493,6 +493,8 @@ build_tmpl_sources() --exec-prefix="$PKGFS_DESTDIR/$pkgname" \ --mandir="$PKGFS_DESTDIR/$pkgname/man" \ --infodir="$PKGFS_DESTDIR/$pkgname/share/info" \ + --libdir="$PKGFS_MASTERDIR/lib" \ + --includedir="$PKGFS_MASTERDIR/include" \ ${configure_args} # diff --git a/templates/libidn-1.9.tmpl b/templates/libidn-1.9.tmpl index 145f9b1039b..cad4dd130de 100755 --- a/templates/libidn-1.9.tmpl +++ b/templates/libidn-1.9.tmpl @@ -4,8 +4,7 @@ extract_sufx=".tar.gz" url=http://ftp.gnu.org/gnu/libidn build_style=gnu_configure configure_env="EMACS=/bin/false" -configure_args="--disable-csharp --disable-java - --libdir=$PKGFS_MASTERDIR/lib" +configure_args="--disable-csharp --disable-java" short_desc="Internationalized Domain Names command line tool" maintainer="Juan RP " checksum=3b2217f015965600b69983cf831746a591f0680e