X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=bootstrap;h=76a93e117a022390b91f733e2fb8fc3596ebd2f1;hb=039c69d648bd9bb481fbd29868b8565952098d70;hp=6726871a881b092bf56f89332fd951e8fe67530a;hpb=ede3bd6058cb462338403a93784a5a5ff3d39b75;p=vlc

diff --git a/bootstrap b/bootstrap
index 6726871a88..76a93e117a 100755
--- a/bootstrap
+++ b/bootstrap
@@ -61,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"
@@ -75,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