upstream

2 files changed, 20 insertions, 10 deletions

diff --git a/admin/ChangeLog b/admin/ChangeLog
index 17cbcbb3bdf..9856f38fabb 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,12 @@
+2011-09-06  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Merge from gnulib (Bug#9169).
+        * notes/copyright: The files compile, config.guess, config.sub,
+        depcomp, install-sh, missing, and move-if-change are now in the
+        new build-aux subdirectory.  The files arg-nonnull.h, c++defs.h,
+        and warn-on-use.h are now in build-aux/snippets.  New file
+        build-aux/snippets/_Noreturn.h.
+
 2011-08-23  Eli Zaretskii  <eliz@gnu.org>
 
         * unidata/unidata-gen.el (unidata-prop-alist): Update the default
diff --git a/admin/notes/copyright b/admin/notes/copyright
index 39eb003a07d..f4d22f9b270 100644
--- a/admin/notes/copyright
+++ b/admin/notes/copyright
@@ -143,7 +143,7 @@ m4/*.m4
 lib/Makefile.in
  - copyright FSF, with MIT-like license
 
-install-sh
+build-aux/install-sh
  - this file is copyright MIT, which is OK. Leave the copyright alone.
 
 etc/refcards/*.tex
@@ -545,16 +545,17 @@ of writing) GPL >= 2. rms says may as well leave the licenses of these
 alone (may import them from Gnulib again). These are:
 
     Gnulib:
-    arg-nonnull.h
-    c++defs.h
-    compile
-    config.guess
-    config.sub
-    depcomp
+    build-aux/compile
+    build-aux/config.guess
+    build-aux/config.sub
+    build-aux/depcomp
+    build-aux/missing
+    build-aux/move-if-change
+    build-aux/snippet/_Noreturn.h
+    build-aux/snippet/arg-nonnull.h
+    build-aux/snippet/c++defs.h
+    build-aux/snippet/warn-on-use.h
     doc/man/texinfo.tex
-    missing
-    move-if-change
-    warn-on-use.h
     lib/*.[ch]
     lib/gnulib.mk
     src/gmalloc.c