This is the mail archive of the
gdb-patches@sourceware.org
mailing list for the GDB project.
[OB PATCH] Fix gnulib/update-gnulib.sh
- From: Gary Benson <gbenson at redhat dot com>
- To: gdb-patches at sourceware dot org
- Date: Fri, 21 Jun 2019 13:26:26 +0100
- Subject: [OB PATCH] 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.
---
gnulib/ChangeLog | 4 ++++
gnulib/update-gnulib.sh | 8 ++++----
2 files changed, 8 insertions(+), 4 deletions(-)
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 @@ if [ "$gnulib_head_sha1" != "$GNULIB_COMMIT_SHA1" ]; then
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 @@ $(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}
+../move-if-change ${ACLOCAL_M4_DEPS_FILE}.tmp ${ACLOCAL_M4_DEPS_FILE}
rm -f ${ACLOCAL_M4_DEPS_FILE}.tmp
--
1.8.3.1