X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=gnulib-tool;h=2ea257dba6093b6eac97cdffcf7412ce2e766698;hb=3d9dacd0b6e872d8caa7fd2c757767b3288d80c3;hp=32f81d79b6afc67b217eaeef19d59dcbfe76e998;hpb=ffda1898a146dd3e142f86054f50dff23a6ae937;p=gnulib.git

diff --git a/gnulib-tool b/gnulib-tool
index 32f81d79b..2ea257dba 100755
--- a/gnulib-tool
+++ b/gnulib-tool
@@ -22,7 +22,7 @@
 
 progname=$0
 package=gnulib
-cvsdatestamp='$Date: 2007-07-18 23:50:58 $'
+cvsdatestamp='$Date: 2007-08-26 10:36:54 $'
 last_checkin_date=`echo "$cvsdatestamp" | sed -e 's,^\$[D]ate: ,,'`
 version=`echo "$last_checkin_date" | sed -e 's/ .*$//' -e 's,/,-,g'`
 nl='
@@ -409,7 +409,7 @@ func_ln_if_changed ()
     echo "usage: func_ln_if_changed SRC DEST" >&2
   fi
   ln_target=`func_readlink "$2"`
-  if test -L "$2" && test "$1" = "$ln_target"; then
+  if test -h "$2" && test "$1" = "$ln_target"; then
     :
   else
     rm -f "$2"
@@ -2031,9 +2031,6 @@ func_import ()
   # The pobase defaults to the cached one.
   if test -z "$pobase"; then
     pobase="$cached_pobase"
-    if test -z "$pobase"; then
-      func_fatal_error "missing --po-base option"
-    fi
   fi
   # The docbase defaults to the cached one.
   if test -z "$docbase"; then
@@ -2086,9 +2083,6 @@ func_import ()
   # The po_domain defaults to the cached one.
   if test -z "$po_domain"; then
     po_domain="$cached_po_domain"
-    if test -z "$po_domain"; then
-      func_fatal_error "missing --po-domain option"
-    fi
   fi
 
   # Canonicalize the list of specified modules.
@@ -2236,7 +2230,7 @@ func_import ()
   sed_take_first_column='s,'"$delimiter"'.*,,'
   for g in `LC_ALL=C join -t"$delimiter" -v1 "$tmp"/old-files "$tmp"/new-files | sed -e "$sed_take_first_column"`; do
     # Remove the file. Do nothing if the user already removed it.
-    if test -f "$destdir/$g"; then
+    if test -f "$destdir/$g" || test -h "$destdir/$g"; then
       if $doit; then
         echo "Removing file $g (backup in ${g}~)"
         mv -f "$destdir/$g" "$destdir/${g}~" || func_fatal_error "failed"
@@ -2804,7 +2798,14 @@ func_import ()
         if test -n "$dir_added"; then
           if $doit; then
             echo "Creating $destdir/$dir$ignore"
-            echo "$dir_added" | sed -e '/^$/d' | LC_ALL=C sort -u > "$destdir/$dir$ignore"
+            {
+              if test "$ignore" = .cvsignore; then
+                echo ".deps"
+                # Automake generates Makefile rules that create .dirstamp files.
+                echo ".dirstamp"
+              fi
+              echo "$dir_added" | sed -e '/^$/d' | LC_ALL=C sort -u
+            } > "$destdir/$dir$ignore"
           else
             echo "Create $destdir/$dir$ignore"
           fi
@@ -2816,7 +2817,7 @@ func_import ()
       dir="$1"
       dir_added="$2"
       dir_removed="$3"
-      if test -d "$destdir/${dir}CVS" || test -f "$destdir/${dir}.cvsignore"; then
+      if test -d "$destdir/CVS" || test -d "$destdir/${dir}CVS" || test -f "$destdir/${dir}.cvsignore"; then
         func_update_ignorelist .cvsignore
       fi
       if test -d "$destdir/.git" || test -f "$destdir/${dir}.gitignore"; then