summaryrefslogtreecommitdiff
path: root/build-aux/bootstrap
diff options
context:
space:
mode:
authorJim Meyering <meyering@redhat.com>2012-07-03 22:22:49 +0200
committerJim Meyering <meyering@redhat.com>2012-07-03 22:27:51 +0200
commitd0ea2a12f6fb377f930886d404f3dfc2a732537d (patch)
tree7b4aff763da28e18735abb94876e25fa128faca7 /build-aux/bootstrap
parentb4dd83bbdab410921cadc223c90890edad10841e (diff)
downloadgnulib-d0ea2a12f6fb377f930886d404f3dfc2a732537d.tar.gz
bootstrap: do not require now-removed build-aux/missing
Now that build-aux/missing is, er, missing, bootstrap would silently fail. * build-aux/bootstrap (gnulib_extra_files): Remove $build_aux/missing from the list, now that (since commit v0.0-7489-gd0f486f) the file is no longer part of gnulib. Diagnose the failure.
Diffstat (limited to 'build-aux/bootstrap')
-rwxr-xr-xbuild-aux/bootstrap9
1 files changed, 5 insertions, 4 deletions
diff --git a/build-aux/bootstrap b/build-aux/bootstrap
index 300e1a86c0..e9849102d8 100755
--- a/build-aux/bootstrap
+++ b/build-aux/bootstrap
@@ -1,6 +1,6 @@
#! /bin/sh
# Print a version string.
-scriptversion=2012-05-15.06; # UTC
+scriptversion=2012-07-03.20; # UTC
# Bootstrap this package from checked-out sources.
@@ -230,7 +230,6 @@ esac
test -z "${gnulib_extra_files}" && \
gnulib_extra_files="
$build_aux/install-sh
- $build_aux/missing
$build_aux/mdate-sh
$build_aux/texinfo.tex
$build_aux/depcomp
@@ -855,7 +854,8 @@ echo "$0: $gnulib_tool $gnulib_tool_options --import ..."
$gnulib_tool $gnulib_tool_options --import $gnulib_modules &&
for file in $gnulib_files; do
- symlink_to_dir "$GNULIB_SRCDIR" $file || exit
+ symlink_to_dir "$GNULIB_SRCDIR" $file \
+ || { echo "$0: failed to symlink $file" 1>&2; exit 1; }
done
bootstrap_post_import_hook \
@@ -896,7 +896,8 @@ for file in $gnulib_extra_files; do
build-aux/*) dst=$build_aux/${file#build-aux/};;
*) dst=$file;;
esac
- symlink_to_dir "$GNULIB_SRCDIR" $file $dst || exit
+ symlink_to_dir "$GNULIB_SRCDIR" $file $dst \
+ || { echo "$0: failed to symlink $file" 1>&2; exit 1; }
done
if test $with_gettext = yes; then