From b9befece95630d13692ea84c9294505e31a71958 Mon Sep 17 00:00:00 2001
From: Scott McCreary <scottmc2@gmail.com>
Date: Mon, 11 Apr 2011 06:27:25 +0000
Subject: [PATCH] Changed several bep files to use aclocal --install

---
 media-libs/sdl-mixer/sdl-mixer-1.2.9.bep | 6 +-----
 media-libs/sdl-rtf/sdl-rtf-0.1.0.bep     | 8 ++------
 media-libs/sdl-ttf/sdl-ttf-2.0.10.bep    | 7 ++-----
 media-libs/smjpeg/smjpeg-0.2.1.bep       | 8 ++------
 4 files changed, 7 insertions(+), 22 deletions(-)

diff --git a/media-libs/sdl-mixer/sdl-mixer-1.2.9.bep b/media-libs/sdl-mixer/sdl-mixer-1.2.9.bep
index a7fe10083..47e2cd0b3 100644
--- a/media-libs/sdl-mixer/sdl-mixer-1.2.9.bep
+++ b/media-libs/sdl-mixer/sdl-mixer-1.2.9.bep
@@ -9,11 +9,7 @@ BUILD {
 	cd SDL_mixer-1.2.9
 	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
diff --git a/media-libs/sdl-rtf/sdl-rtf-0.1.0.bep b/media-libs/sdl-rtf/sdl-rtf-0.1.0.bep
index ce482c217..9b81a0285 100644
--- a/media-libs/sdl-rtf/sdl-rtf-0.1.0.bep
+++ b/media-libs/sdl-rtf/sdl-rtf-0.1.0.bep
@@ -10,14 +10,9 @@ BUILD {
 	rm aclocal.m4
 	rm acinclude.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
 	echo "AC_CONFIG_MACRO_DIR([m4]) >> configure.in"
 	libtoolize --copy --force --install
-	aclocal -I m4
+	aclocal --install -I m4
 	./autogen.sh
 	MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man
 	LIBDIR=`finddir B_COMMON_LIB_DIRECTORY`
@@ -31,5 +26,6 @@ INSTALL {
 	cd SDL_rtf-0.1.0
 	make install
 }
+
 LICENSE="GNU LGPL v2"
 COPYRIGHT="2003-2009 Sam Lantinga"
diff --git a/media-libs/sdl-ttf/sdl-ttf-2.0.10.bep b/media-libs/sdl-ttf/sdl-ttf-2.0.10.bep
index 004216101..15cd7c98e 100644
--- a/media-libs/sdl-ttf/sdl-ttf-2.0.10.bep
+++ b/media-libs/sdl-ttf/sdl-ttf-2.0.10.bep
@@ -10,11 +10,7 @@ BUILD {
 	cd SDL_ttf-2.0.10
 	rm -f acinclude.m4
 	libtoolize --copy --force --install
-	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
 	echo "AC_CONFIG_MACRO_DIR([acinclude]) > configure.in"
 	./autogen.sh
 	MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man
@@ -29,5 +25,6 @@ INSTALL {
 	cd SDL_ttf-2.0.10
 	make install
 }
+
 LICENSE="GNU LGPL v2.1"
 COPYRIGHT="1997-2010 Sam Lantinga"
diff --git a/media-libs/smjpeg/smjpeg-0.2.1.bep b/media-libs/smjpeg/smjpeg-0.2.1.bep
index 04d65bbaa..2208d923a 100644
--- a/media-libs/smjpeg/smjpeg-0.2.1.bep
+++ b/media-libs/smjpeg/smjpeg-0.2.1.bep
@@ -10,13 +10,8 @@ BUILD {
 	rm -f aclocal.m4
 	echo "AC_CONFIG_MACRO_DIR([m4]) > configure.in"
 	mkdir 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 --copy --force --install
-	aclocal -I m4
+	aclocal --install -I m4
 	automake --foreign --add-missing
 	autoconf
 	MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man
@@ -31,5 +26,6 @@ INSTALL {
 	cd smjpeg-0.2.1
 	make install
 }
+
 LICENSE="GNU LGPL v2"
 COPYRIGHT="1999-2004 Sam Lantinga, Joe Tennies."