From d6424b2f5a692d3e7a933f50df7ee9b3fa911a0c Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Mon, 13 Jan 2003 21:57:21 +0000 Subject: [PATCH] Files meant for the AUX_DIR are now in the config subdirectory. --- ChangeLog | 9 +++++++++ gnulib-tool | 14 ++++++++++---- modules/gettext | 2 +- modules/iconv | 2 +- 4 files changed, 21 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9eb871d419..d234ea4c9d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2003-01-11 Bruno Haible + + * 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 * modules/*: Add a description. diff --git a/gnulib-tool b/gnulib-tool index 10308918b3..a6b81eb9ac 100755 --- 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 bd19c5ebeb..e2afa3d9f2 100644 --- 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 78361c6fd6..c537dca64f 100644 --- 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: -- 2.30.2