diff mbox

[OB] Fix gnulib/update-gnulib.sh

Message ID 1561119986-23683-1-git-send-email-gbenson@redhat.com
State New
Headers show

Commit Message

Gary Benson June 21, 2019, 12:26 p.m. UTC
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(-)

Comments

Gary Benson June 21, 2019, 1:10 p.m. UTC | #1
Gary Benson wrote:
> This commit fixes two paths in update-gnulib.sh that weren't
> updated when gnulib was moved to toplevel.

Tom, even the changes I committed I'm not convinced update-gnulib.sh
is working 100% correctly.  Running it as-is (i.e. "updating" to the
version we already have) changes a bunch of autotools files, and I
can't figure out why.  Could you have a quick look at what it's
changing and let me know if the changes below are something I should
be checking in, or, if not, what it is I need to update cleanly.

Thanks,
Gary
Tom Tromey June 21, 2019, 4:07 p.m. UTC | #2
>>>>> "Gary" == Gary Benson <gbenson@redhat.com> writes:

Gary> This commit fixes two paths in update-gnulib.sh that weren't updated
Gary> when gnulib was moved to toplevel.

Gary> gnulib/ChangeLog:

Gary> 	* update-gnulib.sh: Adjust paths.

Thanks for doing this.

Tom
diff mbox

Patch

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