From 459dce26f2cc43e0eda3ccc807f5364a72a7fa51 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Thu, 24 Mar 2011 17:42:10 +0000 Subject: [PATCH] Make use of aclocal --print-ac-dir to locate aclocal. --- dev-libs/libiconv/libiconv-1.13.1.bep | 30 +++++++++++---------------- 1 file changed, 12 insertions(+), 18 deletions(-) diff --git a/dev-libs/libiconv/libiconv-1.13.1.bep b/dev-libs/libiconv/libiconv-1.13.1.bep index 123b71da2..c6428e870 100644 --- a/dev-libs/libiconv/libiconv-1.13.1.bep +++ b/dev-libs/libiconv/libiconv-1.13.1.bep @@ -8,30 +8,24 @@ DEPEND="" BUILD { cd libiconv-1.13.1 rm -rf aclocal.m4 - ln -sf /boot/common/bin/autoconf /boot/common/bin/autoconf-2.63 - ln -sf /boot/common/bin/autoheader /boot/common/bin/autoheader-2.63 - ln -sf /boot/common/bin/aclocal /boot/common/bin/aclocal-1.11 - cp `finddir B_COMMON_DATA_DIRECTORY`/aclocal/libtool.m4 m4 - cp `finddir B_COMMON_DATA_DIRECTORY`/aclocal/ltoptions.m4 m4 - cp `finddir B_COMMON_DATA_DIRECTORY`/aclocal/ltversion.m4 m4 - cp `finddir B_COMMON_DATA_DIRECTORY`/aclocal/ltsugar.m4 m4 - cp `finddir B_COMMON_DATA_DIRECTORY`/aclocal/lt~obsolete.m4 m4 + cp `aclocal --print-ac-dir`/libtool.m4 m4 + cp `aclocal --print-ac-dir`/ltoptions.m4 m4 + cp `aclocal --print-ac-dir`/ltversion.m4 m4 + cp `aclocal --print-ac-dir`/ltsugar.m4 m4 + cp `aclocal --print-ac-dir`/lt~obsolete.m4 m4 echo "AC_CONFIG_MACRO_DIR([m4]) >> configure.ac" - cp -r `finddir B_COMMON_DATA_DIRECTORY`/libtool m4 - libtoolize --force --copy --install + libtoolize -fci aclocal -I m4 -I srcm4 autoconf autoheader cd libcharset - cp `finddir B_COMMON_DATA_DIRECTORY`/aclocal/libtool.m4 m4 - cp `finddir B_COMMON_DATA_DIRECTORY`/aclocal/ltoptions.m4 m4 - cp `finddir B_COMMON_DATA_DIRECTORY`/aclocal/ltversion.m4 m4 - cp `finddir B_COMMON_DATA_DIRECTORY`/aclocal/ltsugar.m4 m4 - cp `finddir B_COMMON_DATA_DIRECTORY`/aclocal/lt~obsolete.m4 m4 + cp `aclocal --print-ac-dir`/libtool.m4 m4 + cp `aclocal --print-ac-dir`/ltoptions.m4 m4 + cp `aclocal --print-ac-dir`/ltversion.m4 m4 + cp `aclocal --print-ac-dir`/ltsugar.m4 m4 + cp `aclocal --print-ac-dir`/lt~obsolete.m4 m4 echo "AC_CONFIG_MACRO_DIR([m4]) >> configure.ac" - libtoolize --force --copy --install - cp -r `finddir B_COMMON_DATA_DIRECTORY`/libtool m4 - libtoolize --force --copy --install + libtoolize -fci aclocal -I m4 autoconf autoheader