Changed several bep files to use aclocal --install

2026-04-22 19:50:05 +02:00 · 2011-04-11 06:58:03 +00:00
parent db729ec691
commit 6c10cfe010
10 changed files with 22 additions and 63 deletions
--- a/dev-libs/fribidi/fribidi-0.19.2.bep
+++ b/dev-libs/fribidi/fribidi-0.19.2.bep
@@ -9,13 +9,8 @@ BUILD {
 	cd fribidi-0.19.2
 	rm -rf aclocal.m4
 	mkdir -p m4
-	cp /boot/common/share/aclocal/libtool.m4 m4
-	cp /boot/common/share/aclocal/ltoptions.m4 m4
-	cp /boot/common/share/aclocal/ltversion.m4 m4
-	cp /boot/common/share/aclocal/ltsugar.m4 m4
-	cp /boot/common/share/aclocal/lt~obsolete.m4 m4
 	libtoolize --force --copy --install
-	aclocal -I m4
+	aclocal --install -I m4
 	automake
 	autoconf
 	COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man
@@ -30,6 +25,7 @@ INSTALL {
 	cd fribidi-0.19.2
 	make install
 }
+
 LICENSE="GNU LGPL v2.1"
 COPYRIGHT="2004 Sharif FarsiWeb, Inc
 	2001,2002 Behdad Esfahbod
--- a/dev-util/pkgconfig/pkgconfig-0.23.bep
+++ b/dev-util/pkgconfig/pkgconfig-0.23.bep
@@ -8,23 +8,13 @@ DEPEND=""
 BUILD {
 	cd pkg-config-0.23/glib-1.2.10
 	mkdir -p m4
-	cp /boot/common/share/aclocal/libtool.m4 m4
-	cp /boot/common/share/aclocal/ltoptions.m4 m4
-	cp /boot/common/share/aclocal/ltversion.m4 m4
-	cp /boot/common/share/aclocal/ltsugar.m4 m4
-	cp /boot/common/share/aclocal/lt~obsolete.m4 m4
 	libtoolize --force --copy --install
-	aclocal -I m4
+	aclocal --install -I m4
 	autoreconf
 	cd ..
 	mkdir -p m4
-	cp /boot/common/share/aclocal/libtool.m4 m4
-	cp /boot/common/share/aclocal/ltoptions.m4 m4
-	cp /boot/common/share/aclocal/ltversion.m4 m4
-	cp /boot/common/share/aclocal/ltsugar.m4 m4
-	cp /boot/common/share/aclocal/lt~obsolete.m4 m4
 	libtoolize --force --copy --install
-	aclocal -I m4
+	aclocal --install -I m4
 	autoreconf	
 	automake
 	autoconf
@@ -36,5 +26,6 @@ INSTALL {
 	cd pkg-config-0.23
 	make install
 }
+
 LICENSE="GNU GPL v2"
 COPYRIGHT="1998, 2001-2006 Red Hat Inc."
--- a/media-libs/libmikmod/libmikmod-3.1.11.bep
+++ b/media-libs/libmikmod/libmikmod-3.1.11.bep
@@ -10,17 +10,16 @@ BUILD {
 	rm aclocal.m4
 	echo "AC_CONFIG_MACRO_DIR([m4])" >> configure.in
 	libtoolize --force --copy --install
-	cp /boot/common/share/aclocal/libtool.m4 m4
-	cp /boot/common/share/aclocal/ltoptions.m4 m4
-	cp /boot/common/share/aclocal/ltversion.m4 m4
-	cp /boot/common/share/aclocal/ltsugar.m4 m4
-	cp /boot/common/share/aclocal/lt~obsolete.m4 m4
-	aclocal -I m4
+	aclocal --install -I m4
 	autoconf
 	automake --add-missing
+	DATADIR=`finddir B_COMMON_DATA_DIRECTORY`
+	INFODIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/info
 	MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man
 	LIBDIR=`finddir B_COMMON_LIB_DIRECTORY`
 	./configure --prefix=`finddir B_COMMON_DIRECTORY` \
+		--datadir=$DATADIR \
+		--infodir=$INFODIR \
 		--libdir=$LIBDIR \
 		--mandir=$MANDIR
 	make
@@ -30,5 +29,6 @@ INSTALL {
 	cd libmikmod-3.1.11
 	make install
 }
+
 LICENSE="GNU LGPL v2.1"
 COPYRIGHT="1998-2004 Jean-Paul Mikkers, Jake Stine, Frank Loemker, Steve McIntyre, Peter Amstutz, and Miodrag Vallat."
--- a/media-libs/libogg/libogg-1.2.0.bep
+++ b/media-libs/libogg/libogg-1.2.0.bep
@@ -9,11 +9,9 @@ BUILD {
 	cd libogg-1.2.0
 	rm aclocal.m4
 	mkdir -p m4
-	cp /boot/common/share/aclocal/ltversion.m4 m4	
 	libtoolize --force --copy --install
 	echo 'AC_CONFIG_MACRO_DIR([m4]) >> configure.in'
-	libtoolize --force --copy --install
-	aclocal -I m4
+	aclocal --install -I m4
 	autoconf
 	./configure --prefix=/boot/common
 	make
@@ -23,5 +21,6 @@ INSTALL {
 	cd libogg-1.2.0
 	make install
 }
+
 LICENSE="BSD (3-clause)"
 COPYRIGHT="1994-2010 Xiph.Org Foundation"
--- a/media-libs/libsndfile/libsndfile-1.0.21.bep
+++ b/media-libs/libsndfile/libsndfile-1.0.21.bep
@@ -13,18 +13,13 @@ DEPEND="media-libs/flac >= 1.2.1
 BUILD {
 	cd libsndfile-1.0.21
 	rm aclocal.m4
-	cp /boot/common/share/aclocal/libtool.m4 M4
-	cp /boot/common/share/aclocal/ltoptions.m4 M4
-	cp /boot/common/share/aclocal/ltversion.m4 M4
-	cp /boot/common/share/aclocal/ltsugar.m4 M4
-	cp /boot/common/share/aclocal/lt~obsolete.m4 M4
 	echo "AC_CONFIG_MACRO_DIR([M4]) >> configure.in"
 	libtoolize --force --copy --install
-	aclocal -I M4
+	aclocal --install -I M4
 	autoconf
 	autoheader
 	automake
-	./configure --prefix=/boot/common
+	./configure --prefix=`finddir B_COMMON_DIRECTORY`
 	make
 }

--- a/media-libs/libvorbis/libvorbis-1.2.3.bep
+++ b/media-libs/libvorbis/libvorbis-1.2.3.bep
@@ -9,12 +9,7 @@ BUILD {
 	cd libvorbis-1.2.3
 	libtoolize --force --copy --install
 	mkdir -p m4
-	cp /boot/common/share/aclocal/libtool.m4 m4
-	cp /boot/common/share/aclocal/ltoptions.m4 m4
-	cp /boot/common/share/aclocal/ltversion.m4 m4
-	cp /boot/common/share/aclocal/ltsugar.m4 m4
-	cp /boot/common/share/aclocal/lt~obsolete.m4 m4
-	aclocal -I m4
+	aclocal --install -I m4
 	autoconf
 	automake
 	./configure --prefix=/boot/common
@@ -25,5 +20,6 @@ INSTALL {
 	cd libvorbis-1.2.3
 	make install
 }
+
 LICENSE="BSD (3-clause)"
 COPYRIGHT="1994-2010 Xiph.Org Foundation"
--- a/media-libs/libvorbis/libvorbis-1.3.1.bep
+++ b/media-libs/libvorbis/libvorbis-1.3.1.bep
@@ -10,12 +10,7 @@ BUILD {
 	cd libvorbis-1.3.1
 	libtoolize --force --copy --install
 	mkdir -p m4
-	cp /boot/common/share/aclocal/libtool.m4 m4
-	cp /boot/common/share/aclocal/ltoptions.m4 m4
-	cp /boot/common/share/aclocal/ltversion.m4 m4
-	cp /boot/common/share/aclocal/ltsugar.m4 m4
-	cp /boot/common/share/aclocal/lt~obsolete.m4 m4
-	aclocal -I m4
+	aclocal --install -I m4
 	autoconf
 	automake
 	./configure --prefix=/boot/common
--- a/media-libs/sdl-image/sdl-image-1.2.8.bep
+++ b/media-libs/sdl-image/sdl-image-1.2.8.bep
@@ -7,13 +7,8 @@ STATUS_HAIKU="stable"
 DEPEND=""
 BUILD {
 	cd SDL_image-1.2.8
-	cp /boot/common/share/aclocal/libtool.m4 acinclude
-	cp /boot/common/share/aclocal/ltoptions.m4 acinclude
-	cp /boot/common/share/aclocal/ltversion.m4 acinclude
-	cp /boot/common/share/aclocal/ltsugar.m4 acinclude
-	cp /boot/common/share/aclocal/lt~obsolete.m4 acinclude
 	libtoolize --force --copy --install
-	aclocal -I acinclude
+	aclocal --install -I acinclude
 	./autogen.sh
 	./configure --prefix=/boot/common
 	make
--- a/media-libs/sdl-image/sdl-image-1.2.9.bep
+++ b/media-libs/sdl-image/sdl-image-1.2.9.bep
@@ -7,13 +7,8 @@ STATUS_HAIKU="stable"
 DEPEND=""
 BUILD {
 	cd SDL_image-1.2.9
-	cp /boot/common/share/aclocal/libtool.m4 acinclude
-	cp /boot/common/share/aclocal/ltoptions.m4 acinclude
-	cp /boot/common/share/aclocal/ltversion.m4 acinclude
-	cp /boot/common/share/aclocal/ltsugar.m4 acinclude
-	cp /boot/common/share/aclocal/lt~obsolete.m4 acinclude
 	libtoolize --force --copy --install
-	aclocal -I acinclude
+	aclocal --install -I acinclude
 	./autogen.sh
 	./configure --prefix=/boot/common
 	make
--- a/media-libs/sdl-mixer/sdl-mixer-1.2.10.bep
+++ b/media-libs/sdl-mixer/sdl-mixer-1.2.10.bep
@@ -9,11 +9,7 @@ BUILD {
 	cd SDL_mixer-1.2.10
 	libtoolize --force --copy --install
 	cp ltmain.sh build-scripts/ltmain.sh
-	cp /boot/common/share/aclocal/libtool.m4 acinclude
-	cp /boot/common/share/aclocal/ltoptions.m4 acinclude
-	cp /boot/common/share/aclocal/ltversion.m4 acinclude
-	cp /boot/common/share/aclocal/ltsugar.m4 acinclude
-	cp /boot/common/share/aclocal/lt~obsolete.m4 acinclude
+	aclocal --install -I acinclude
 	./autogen.sh
 	./configure --prefix=/boot/common
 	make
@@ -23,5 +19,6 @@ INSTALL {
 	cd SDL_mixer-1.2.10
 	make install
 }
+
 LICENSE="GNU LGPL v2.1"
 COPYRIGHT="1997-2009 Sam Lantinga"