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 0ab658ce93ae924bdb81985c407fdadf03c43919..f530b5b5fad9f84d3ecb5136da6dc06a1ec1bb5b 100644 (file)
--- 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 d83c93eba85445e788fadbdb624b8ff6258e4c32..ff51ca4b7fe3f2f7347ded65ef7e7a02bfad13ae 100644 (file)
--- 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)