summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2012-05-14 23:24:49 -0700
committerPaul Eggert <eggert@cs.ucla.edu>2012-05-14 23:25:14 -0700
commitbca6d67e3f92b9c358e96098d7cd9b841dc16604 (patch)
tree48f163fc0fe03a7539deecf572d8e129dee4af58
parent3549f733b9cd2c7fd5dd1e4a273151e2da01a00b (diff)
downloaddiffutils-bca6d67e3f92b9c358e96098d7cd9b841dc16604.tar.gz
maint: update bootstrap from gnulib
* bootstrap: Update from gnulib.
-rwxr-xr-xbootstrap6
1 files changed, 2 insertions, 4 deletions
diff --git a/bootstrap b/bootstrap
index 78f335e..ce37a2c 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1,6 +1,6 @@
#! /bin/sh
# Print a version string.
-scriptversion=2012-05-14.21; # UTC
+scriptversion=2012-05-15.06; # UTC
# Bootstrap this package from checked-out sources.
@@ -307,7 +307,7 @@ insert_sorted_if_absent() {
file=$1
str=$2
test -f $file || touch $file
- echo "$str" | sort_patterns - $file | cmp - $file > /dev/null \
+ echo "$str" | sort_patterns - $file | cmp -s - $file > /dev/null \
|| { echo "$str" | sort_patterns - $file > $file.bak \
&& mv $file.bak $file; } \
|| exit 1
@@ -811,7 +811,6 @@ if test $with_gettext = yes || test $use_libtool = 1; then
$LIBTOOLIZE $install --copy
fi
- set -x
find . ! -type d -print | sort >$tempbase.1
old_IFS=$IFS
IFS=$nl
@@ -827,7 +826,6 @@ if test $with_gettext = yes || test $use_libtool = 1; then
}
done
IFS=$old_IFS
- set +x
rm -f $tempbase.0 $tempbase.1
trap - 1 2 13 15