X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=bootstrap;h=76a93e117a022390b91f733e2fb8fc3596ebd2f1;hb=1f066ddee63a5f1f6d0b5fa682f77fc427d9d206;hp=38f85ff2891ec439d556ef4a5009d7bef09fb8d1;hpb=3b851f4e9c531f2d90c305b3d632cddc082791fc;p=vlc

diff --git a/bootstrap b/bootstrap
index 38f85ff289..76a93e117a 100755
--- a/bootstrap
+++ b/bootstrap
@@ -19,26 +19,17 @@ 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
 ###
 CYGWIN=binmode
 export CYGWIN
 
-# Check for contrib directory
-if test -d extras/contrib/build/bin; then
-  PATH="`pwd`/extras/contrib/build/bin:$PATH"
-  if test -d extras/contrib/build/share/aclocal; then
-    ACLOCAL_ARGS="${ACLOCAL_ARGS} -I extras/contrib/build/share/aclocal"
-  fi
-  if test ".`uname -s`" = ".Darwin"; then
-    LD_LIBRARY_PATH=./extras/contrib/build/lib:$LD_LIBRARY_PATH
-    DYLD_LIBRARY_PATH=./extras/contrib/build/lib:$DYLD_LIBRARY_PATH
-    export LD_LIBRARY_PATH
-    export DYLD_LIBRARY_PATH
-  fi
-fi
-
 # Check for pkg-config
 if ! "${PKG_CONFIG:-pkg-config}" --version >/dev/null 2>&1; then
 	echo 'Error: "pkg-config" is not installed.' >&2
@@ -70,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"
@@ -84,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