diff options
| author | Gary Benson <gbenson@redhat.com> | 2019-06-21 13:23:59 +0100 |
|---|---|---|
| committer | Gary Benson <gbenson@redhat.com> | 2019-06-21 13:23:59 +0100 |
| commit | 70175d8d62178279d0fecce661b26a4f5b209fea (patch) | |
| tree | 87c62d1b458680cc57aac7bdbec16b0df475a5ad /gnulib | |
| parent | cf02c44dfd2876867ebd6baa3ce19cf41ff978e1 (diff) | |
| download | fsf-binutils-gdb-70175d8d62178279d0fecce661b26a4f5b209fea.zip fsf-binutils-gdb-70175d8d62178279d0fecce661b26a4f5b209fea.tar.gz fsf-binutils-gdb-70175d8d62178279d0fecce661b26a4f5b209fea.tar.bz2 | |
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.
Diffstat (limited to 'gnulib')
| -rw-r--r-- | gnulib/ChangeLog | 4 | ||||
| -rwxr-xr-x | gnulib/update-gnulib.sh | 8 |
2 files changed, 8 insertions, 4 deletions
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 @@ 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 |