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='
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"
# 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
# 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.
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"
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
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