From patchwork Fri Jun 21 12:26:26 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gary Benson X-Patchwork-Id: 33252 Received: (qmail 30304 invoked by alias); 21 Jun 2019 12:26:32 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 30292 invoked by uid 89); 21 Jun 2019 12:26:32 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-26.9 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, SPF_HELO_PASS autolearn=ham version=3.3.1 spammy= X-HELO: mx1.redhat.com Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Fri, 21 Jun 2019 12:26:31 +0000 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 433E9308FBA9 for ; Fri, 21 Jun 2019 12:26:30 +0000 (UTC) Received: from blade.nx (unknown [10.40.205.63]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0556E19C4F for ; Fri, 21 Jun 2019 12:26:30 +0000 (UTC) Received: from blade.com (localhost [127.0.0.1]) by blade.nx (Postfix) with ESMTP id A4369816CD3E for ; Fri, 21 Jun 2019 13:26:28 +0100 (BST) From: Gary Benson To: gdb-patches@sourceware.org Subject: [OB PATCH] Fix gnulib/update-gnulib.sh Date: Fri, 21 Jun 2019 13:26:26 +0100 Message-Id: <1561119986-23683-1-git-send-email-gbenson@redhat.com> X-IsSubscribed: yes 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