Install files from top/ in the destination directory.

diff --git a/ChangeLog b/ChangeLog
index f20f7988b7760aa2958e3ca0a6a599d1364ad631..2105eba797561198971fcc892e2f3beb9b3945a5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2008-03-23  Eric Blake  <ebb9@byu.net>
+            Bruno Haible  <bruno@clisp.org>
+
+       Install files from top/ in the destination directory.
+       * gnulib-tool (func_get_automake_snippet): Synthesize an EXTRA_DIST
+       augmentation also for the files from top/.
+       (func_import, func_create_testdir): Rewrite file names:
+       top/filename -> filename.
+
 2008-03-23  Bruno Haible  <bruno@clisp.org>
 
        Tweak "gnulib --version" output.

diff --git a/gnulib-tool b/gnulib-tool
index df7253240da68197bc72b98fcf58ce7e161f5647..a36a95a7f50fc1a5f1c079ea48f9980a2c74e82d 100755 (executable)
--- a/gnulib-tool
+++ b/gnulib-tool
@@ -1370,6 +1370,17 @@ func_get_automake_snippet ()
         echo "EXTRA_DIST += "`echo "$buildaux_files" | sed -e "$sed_prepend_auxdir"`
         echo
       fi
+      # Synthesize an EXTRA_DIST augmentation also for the files from top/.
+      top_files=`for f in $all_files; do \
+                   case $f in \
+                     top/*) echo $f ;; \
+                   esac; \
+                 done | sed -e 's,^top/,,'`
+      if test -n "$top_files"; then
+        sed_prepend_topdir='s,^,$(top_srcdir)/,'
+        echo "EXTRA_DIST += "`echo "$top_files" | sed -e "$sed_prepend_topdir"`
+        echo
+      fi
       ;;
   esac
 }
@@ -2505,14 +2516,16 @@ func_import ()
     s,^lib/,$cached_sourcebase/,
     s,^m4/,$cached_m4base/,
     s,^tests/,$cached_testsbase/,
-    s,^tests=lib/,$cached_testsbase/,"
+    s,^tests=lib/,$cached_testsbase/,
+    s,^top/,,"
   sed_rewrite_new_files="\
     s,^build-aux/,$auxdir/,
     s,^doc/,$docbase/,
     s,^lib/,$sourcebase/,
     s,^m4/,$m4base/,
     s,^tests/,$testsbase/,
-    s,^tests=lib/,$testsbase/,"
+    s,^tests=lib/,$testsbase/,
+    s,^top/,,"
 
   # Create directories.
   { echo "$sourcebase"
@@ -3444,7 +3457,8 @@ func_create_testdir ()
     s,^doc/,$docbase/,
     s,^lib/,$sourcebase/,
     s,^m4/,$m4base/,
-    s,^tests/,$testsbase/,"
+    s,^tests/,$testsbase/,
+    s,^top/,,"
 
   # Create directories.
   for f in $files; do echo $f; done \