X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=bootstrap;h=c832aefe78e4c50ec9a14749ea9ae47171a7b3dd;hb=a62d119ac4cc1f48f53d649fa75d260a8d7fbf04;hp=1eaa5664030b6146cd08afce156ccfacac090e42;hpb=6fa1935b5a4d1894689fac30c358a5b1887677c9;p=vlc

diff --git a/bootstrap b/bootstrap
index 1eaa566403..c832aefe78 100755
--- a/bootstrap
+++ b/bootstrap
@@ -61,9 +61,9 @@ fi
 ###
 
 echo "generating modules/**/Makefile.am"
-find modules/ -name Modules.am | \
-sed -ne 's,modules/\(.*\)/Modules.am,\1,p' | \
-while read d; do
+for d in modules/*/Modules.am modules/*/*/Modules.am; do
+	d="${d#modules/}"
+	d="${d%/Modules.am}"
 	${CONFIG_SHELL-sh} modules/genmf "$d"
 	printf "."
 done
@@ -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