diff options
-rw-r--r-- | misc/ChangeLog | 5 | ||||
-rw-r--r-- | misc/gettextize.in | 14 |
2 files changed, 18 insertions, 1 deletions
diff --git a/misc/ChangeLog b/misc/ChangeLog index 550b2c7..f480ff5 100644 --- a/misc/ChangeLog +++ b/misc/ChangeLog @@ -1,3 +1,8 @@ +2001-12-06 Bruno Haible <bruno@clisp.org> + + * gettextize.in: Install config.rpath in the directory specified + through AC_CONFIG_AUX_DIR, not necessarily in the toplevel dir. + 2001-12-02 Bruno Haible <bruno@clisp.org> * gettextize.in: Also copy config.rpath, and recommend to copy diff --git a/misc/gettextize.in b/misc/gettextize.in index 071922b..5b02eec 100644 --- a/misc/gettextize.in +++ b/misc/gettextize.in @@ -153,11 +153,23 @@ cd $gettext_dir || { # Now copy all files. Take care for the destination directories. for file in *; do case $file in - ABOUT-NLS | config.rpath) + ABOUT-NLS) rm -f $srcdir/$file ($try_ln_s && ln -s $gettext_dir/$file $srcdir/$file && $echo "Symlinking file $file") 2>/dev/null || { $echo "Copying file $file"; cp $file $srcdir/$file; } ;; + config.rpath) + auxdir= + if test -f $srcdir/configure.in || test -f $srcdir/configure.ac; then + auxdir=`(cat $srcdir/configure.in 2>/dev/null; cat $srcdir/configure.ac 2>/dev/null) | grep '^AC_CONFIG_AUX_DIR' | sed -n -e 's/AC_CONFIG_AUX_DIR(\([^()]*\))/\1/p' | sed -e 's/^\[\(.*\)\]$/\1/' | head -1` + fi + if test -n "$auxdir"; then + auxdir="$auxdir/" + fi + rm -f $srcdir/$auxdir$file + ($try_ln_s && ln -s $gettext_dir/$file $srcdir/$auxdir$file && $echo "Symlinking file $auxdir$file") 2>/dev/null || + { $echo "Copying file $auxdir$file"; cp $file $srcdir/$auxdir$file; } + ;; esac done |