From: Joel Brobecker <brobecker@gnat.com>
Date: Tue, 5 Jun 2012 13:29:07 +0000 (+0000)
Subject: copyright.py: Update path to gnulib import.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=399501a53f685885a43ea9d506f6707e596aa6d6;p=binutils-gdb.git

copyright.py: Update path to gnulib import.

The location where we store the gnulib import has changed.
This patch updates accordingly the path to gnulib's update-copyright
script.

gdb/ChangeLog:

        * copyright.py (update_files, main): Fix path to update-copyright
        script.
---

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 0ab658ce93a..f530b5b5fad 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2012-06-05  Joel Brobecker  <brobecker@adacore.com>
+
+	* copyright.py (update_files, main): Fix path to update-copyright
+	script.
+
 2012-06-05  Joel Brobecker  <brobecker@adacore.com>
 
 	* copyright.py (MULTIPLE_COPYRIGHT_HEADERS): New constant.
diff --git a/gdb/copyright.py b/gdb/copyright.py
index d83c93eba85..ff51ca4b7fe 100644
--- a/gdb/copyright.py
+++ b/gdb/copyright.py
@@ -79,7 +79,9 @@ def update_files(update_list):
     os.environ['UPDATE_COPYRIGHT_USE_INTERVALS'] = '2'
 
     # Perform the update, and save the output in a string.
-    update_cmd = ['bash', 'gdb/gnulib/extra/update-copyright'] + update_list
+    update_cmd = ['bash', 'gdb/gnulib/import/extra/update-copyright']
+    update_cmd += update_list
+
     p = subprocess.Popen(update_cmd, stdout=subprocess.PIPE,
                          stderr=subprocess.STDOUT)
     update_out = p.communicate()[0]
@@ -139,7 +141,7 @@ def may_have_copyright_notice(filename):
 
 def main ():
     """The main subprogram."""
-    if not os.path.isfile("gnulib/extra/update-copyright"):
+    if not os.path.isfile("gnulib/import/extra/update-copyright"):
         print "Error: This script must be called from the gdb directory."
     root_dir = os.path.dirname(os.getcwd())
     os.chdir(root_dir)