X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=bootstrap;h=76a93e117a022390b91f733e2fb8fc3596ebd2f1;hb=a199a57b242facb48583bb8776890fba49ce240f;hp=76d1fe854cb48305ffa3733efd3eb548bbf85d5b;hpb=668bd49f54b2dbdb7121e18d316fc071f9ca0ddf;p=vlc

diff --git a/bootstrap b/bootstrap
index 76d1fe854c..76a93e117a 100755
--- a/bootstrap
+++ b/bootstrap
@@ -19,6 +19,11 @@ fi
 
 ACLOCAL_ARGS="-I m4 ${ACLOCAL_ARGS}"
 
+# Check for tools directory
+if test -d extras/tools/build/bin; then
+  PATH="`pwd`/extras/tools/build/bin:$PATH"
+fi
+
 ###
 ###  Get a sane environment, just in case
 ###
@@ -56,10 +61,10 @@ fi
 ###
 
 echo "generating modules/**/Makefile.am"
-find modules/ -name Modules.am | \
-sed -ne 's,modules/\(.*\)/Modules.am,\1,p' | \
-while read d; do
-	sh modules/genmf "$d"
+for d in modules/*/*/Modules.am; do
+	d="${d#modules/}"
+	d="${d%/Modules.am}"
+	${CONFIG_SHELL-sh} modules/genmf "$d"
 	printf "."
 done
 printf "\n"
@@ -70,14 +75,8 @@ set -x
 ###  classic bootstrap stuff
 ###
 
-# Automake complains if these are not present
-echo > ABOUT-NLS
-cp -f INSTALL INSTALL.git
-
 autoreconf --install --force --verbose ${ACLOCAL_ARGS}
-rm -f po/Makevars.template ABOUT-NLS
-echo > ABOUT-NLS
-mv -f INSTALL.git INSTALL
+rm -f po/Makevars.template
 
 ##
 ##  files which need to be regenerated