Fix gnulib/update-gnulib.sh
This commit fixes two paths in update-gnulib.sh that weren't updated
when gnulib was moved to toplevel.
gnulib/ChangeLog:
* update-gnulib.sh: Adjust paths.
diff --git a/gnulib/ChangeLog b/gnulib/ChangeLog
index 930023e..0117dc5 100644
--- a/gnulib/ChangeLog
+++ b/gnulib/ChangeLog
@@ -1,3 +1,7 @@
+2019-06-21 Gary Benson <gbenson@redhat.com>
+
+ * update-gnulib.sh: Adjust paths.
+
2019-06-14 Tom Tromey <tom@tromey.com>
* update-gnulib.sh: Adjust paths.
diff --git a/gnulib/update-gnulib.sh b/gnulib/update-gnulib.sh
index fb79b23..0e1df22 100755
--- a/gnulib/update-gnulib.sh
+++ b/gnulib/update-gnulib.sh
@@ -100,9 +100,9 @@
exit 1
fi
-# Verify that we are in the gdb/ subdirectory.
-if [ ! -f ../main.c -o ! -d import ]; then
- echo "Error: This script should be called from the gdb/gnulib subdirectory."
+# Verify that we are in the correct directory.
+if [ ! -f ../gdb/main.c -o ! -d import ]; then
+ echo "Error: This script should be called from the gnulib subdirectory."
echo "Aborting."
exit 1
fi
@@ -191,5 +191,5 @@
sed 's/^/ /; s/$/ \\/; $s/ \\//g')
EOF
-../../move-if-change ${ACLOCAL_M4_DEPS_FILE}.tmp ${ACLOCAL_M4_DEPS_FILE}
+../move-if-change ${ACLOCAL_M4_DEPS_FILE}.tmp ${ACLOCAL_M4_DEPS_FILE}
rm -f ${ACLOCAL_M4_DEPS_FILE}.tmp