Mercurial > gnulib

changeset 6556:85c3c00fcec1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix sed_replace_auxdir.
author Bruno Haible <bruno@clisp.org>
date Thu, 12 Jan 2006 15:39:50 +0000
parents ed2b5c29e4cb
children 103bc700d0b0
files ChangeLog gnulib-tool
diffstat 2 files changed, 39 insertions(+), 22 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Thu Jan 12 13:04:57 2006 +0000
+++ b/ChangeLog	Thu Jan 12 15:39:50 2006 +0000
@@ -1,3 +1,8 @@
+2006-01-12  Bruno Haible  <bruno@clisp.org>
+
+	* gnulib-tool (func_import, func_create_testdir): Don't go into an
+	endless loop while replacing $auxdir with build-aux.
+
 2006-01-12  Bruno Haible  <bruno@clisp.org>
 
 	* modules/ldd: New file.
--- a/gnulib-tool	Thu Jan 12 13:04:57 2006 +0000
+++ b/gnulib-tool	Thu Jan 12 15:39:50 2006 +0000
@@ -22,7 +22,7 @@
 
 progname=$0
 package=gnulib
-cvsdatestamp='$Date: 2006-01-11 16:37:10 $'
+cvsdatestamp='$Date: 2006-01-12 15:39:50 $'
 last_checkin_date=`echo "$cvsdatestamp" | sed -e 's,^\$[D]ate: ,,'`
 version=`echo "$last_checkin_date" | sed -e 's/ .*$//' -e 's,/,-,g'`
 
@@ -1322,13 +1322,17 @@
     else
       echo "  AM_CONDITIONAL([GL_COND_LIBTOOL], [true])"
     fi
-    sed_replace_build_aux='
-      :a
-      /AC_CONFIG_FILES(.*:build-aux\/.*)/{
-        s|AC_CONFIG_FILES(\(.*\):build-aux/\(.*\))|AC_CONFIG_FILES(\1:'"$auxdir"'/\2)|
-        ba
-      }'
-    sed_replace_build_aux=`echo "$sed_replace_build_aux" | sed -e 1d -e 's/^ *//'`
+    if test "$auxdir" != "build-aux"; then
+      sed_replace_build_aux='
+        :a
+        /AC_CONFIG_FILES(.*:build-aux\/.*)/{
+          s|AC_CONFIG_FILES(\(.*\):build-aux/\(.*\))|AC_CONFIG_FILES(\1:'"$auxdir"'/\2)|
+          ba
+        }'
+      sed_replace_build_aux=`echo "$sed_replace_build_aux" | sed -e 1d -e 's/^ *//'`
+    else
+      sed_replace_build_aux=
+    fi
     for module in $modules; do
       func_verify_module
       if test -n "$module"; then
@@ -1544,13 +1548,17 @@
      else
        echo "AM_CONDITIONAL([GL_COND_LIBTOOL], [true])"
      fi
-     sed_replace_build_aux='
-       :a
-       /AC_CONFIG_FILES(.*:build-aux\/.*)/{
-         s|AC_CONFIG_FILES(\(.*\):build-aux/\(.*\))|AC_CONFIG_FILES(\1:../'"$auxdir"'/\2)|
-         ba
-       }'
-     sed_replace_build_aux=`echo "$sed_replace_build_aux" | sed -e 1d -e 's/^ *//'`
+     if test "$auxdir" != "build-aux"; then
+       sed_replace_build_aux='
+         :a
+         /AC_CONFIG_FILES(.*:build-aux\/.*)/{
+           s|AC_CONFIG_FILES(\(.*\):build-aux/\(.*\))|AC_CONFIG_FILES(\1:../'"$auxdir"'/\2)|
+           ba
+         }'
+       sed_replace_build_aux=`echo "$sed_replace_build_aux" | sed -e 1d -e 's/^ *//'`
+     else
+       sed_replace_build_aux=
+     fi
      # We don't have explicit ordering constraints between the various
      # autoconf snippets. It's cleanest to put those of the library before
      # those of the tests.
@@ -1621,13 +1629,17 @@
    else
      echo "AM_CONDITIONAL([GL_COND_LIBTOOL], [true])"
    fi
-   sed_replace_build_aux='
-     :a
-     /AC_CONFIG_FILES(.*:build-aux\/.*)/{
-       s|AC_CONFIG_FILES(\(.*\):build-aux/\(.*\))|AC_CONFIG_FILES(\1:'"$auxdir"'/\2)|
-       ba
-     }'
-   sed_replace_build_aux=`echo "$sed_replace_build_aux" | sed -e 1d -e 's/^ *//'`
+   if test "$auxdir" != "build-aux"; then
+     sed_replace_build_aux='
+       :a
+       /AC_CONFIG_FILES(.*:build-aux\/.*)/{
+         s|AC_CONFIG_FILES(\(.*\):build-aux/\(.*\))|AC_CONFIG_FILES(\1:'"$auxdir"'/\2)|
+         ba
+       }'
+     sed_replace_build_aux=`echo "$sed_replace_build_aux" | sed -e 1d -e 's/^ *//'`
+   else
+     sed_replace_build_aux=
+   fi
    for module in $modules; do
      func_verify_nontests_module
      if test -n "$module"; then