Generate gnulib's toplevel Makefile.in using automake

[deliverable/binutils-gdb.git] / gnulib / update-gnulib.sh

diff --git a/gnulib/update-gnulib.sh b/gnulib/update-gnulib.sh
index 0c8357c8880f89c1bbc2c9f5293920d5afc19a6b..634676a68d8c33d446ed1ae763ecdaf263e33b99 100755 (executable)
--- a/gnulib/update-gnulib.sh
+++ b/gnulib/update-gnulib.sh
@@ -174,7 +174,7 @@ apply_patches "patches/0002-mkostemp-mkostemps-Fix-compilation-error-in-C-mode-o
 apply_patches "patches/0003-Fix-glob-c-Coverity-issues.patch"
 
 # Regenerate all necessary files...
-aclocal -Iimport/m4 -I../config &&
+aclocal &&
 autoconf &&
 autoheader &&
 automake
@@ -182,15 +182,3 @@ if [ $? -ne 0 ]; then
    echo "Error: Failed to regenerate Makefiles and configure scripts."
    exit 1
 fi
-
-# Update aclocal-m4-deps.mk
-ACLOCAL_M4_DEPS_FILE=aclocal-m4-deps.mk
-cat > ${ACLOCAL_M4_DEPS_FILE}.tmp <<EOF
-# THIS FILE IS GENERATED.  -*- buffer-read-only: t -*- vi :set ro:
-aclocal_m4_deps = \\
-$(find import/m4 -type f -name "*.m4" | LC_COLLATE=C sort | \
-  sed 's/^/    /; s/$/ \\/; $s/ \\//g')
-EOF
-
-../move-if-change ${ACLOCAL_M4_DEPS_FILE}.tmp ${ACLOCAL_M4_DEPS_FILE}
-rm -f ${ACLOCAL_M4_DEPS_FILE}.tmp