Files meant for the AUX_DIR are now in the config subdirectory.

diff --git a/ChangeLog b/ChangeLog
index 9eb871d4199a457beec51b7658425a0748017741..d234ea4c9d74116465336a8f0be87d39c533a358 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2003-01-11  Bruno Haible  <bruno@clisp.org>
+
+       * gnulib-tool (func_create_testdir): Store config/* files in the main
+       directory.
+       * config.rpath: Move to ...
+       * config/config.rpath: ... here.
+       * modules/gettext: Contains config/config.rpath, not config.rpath.
+       * modules/iconv: Likewise.
+
 2003-01-11  Bruno Haible  <bruno@clisp.org>
 
        * modules/*: Add a description.

diff --git a/gnulib-tool b/gnulib-tool
index 10308918b3350d7e2d56ce1a3df1197612fbaa03..a6b81eb9aca2147994592bd490c70a2c400d89a9 100755 (executable)
--- a/gnulib-tool
+++ b/gnulib-tool
@@ -22,7 +22,7 @@
 
 progname=$0
 package=gnulib
-cvsdatestamp='$Date: 2003-01-13 16:03:12 $'
+cvsdatestamp='$Date: 2003-01-13 21:57:21 $'
 last_checkin_date=`echo "$cvsdatestamp" | sed -e 's,^\$[D]ate: ,,'`
 version=`echo "$last_checkin_date" | sed -e 's/ .*$//' -e 's,/,-,g'`
 
@@ -318,13 +318,19 @@ func_create_testdir ()
 
   # Create directories.
   for d in `echo "$files" | sed -n -e 's,^\(.*\)/[^/]*,\1,p'`; do
-    mkdir -p "$testdir/$d"
+    if test "$d" != config; then
+      mkdir -p "$testdir/$d"
+    fi
   done
 
   # Copy files.
   for f in $files; do
-    ln "$gnulib_dir/$f" "$testdir/$f" 2>/dev/null ||
-    cp -p "$gnulib_dir/$f" "$testdir/$f"
+    case "$f" in
+      config/*) g=`echo "$f" | sed -e 's,^config/,,'` ;;
+      *) g="$f" ;;
+    esac
+    ln "$gnulib_dir/$f" "$testdir/$g" 2>/dev/null ||
+    cp -p "$gnulib_dir/$f" "$testdir/$g"
   done
 
   # Create lib/Makefile.am.

diff --git a/modules/gettext b/modules/gettext
index bd19c5ebeb667e8165c4be94373de47b1ab88546..e2afa3d9f2095ca2d59299a75bc3f3b49cef2eb6 100644 (file)
--- a/modules/gettext
+++ b/modules/gettext
@@ -20,7 +20,7 @@ m4/progtest.m4
 m4/stdint_h.m4
 m4/uintmax_t.m4
 m4/ulonglong.m4
-config.rpath
+config/config.rpath
 
 Depends-on:
 

diff --git a/modules/iconv b/modules/iconv
index 78361c6fd65b0143a79585152857af58c0ca59b6..c537dca64f8859a9452ec4dc43b6ce9de64ab977 100644 (file)
--- a/modules/iconv
+++ b/modules/iconv
@@ -6,7 +6,7 @@ m4/iconv.m4
 m4/lib-ld.m4
 m4/lib-link.m4
 m4/lib-prefix.m4
-config.rpath
+config/config.rpath
 
 Depends-on: