From: Gary V. Vaughan <gary@gnu.org>
Date: Tue, 18 Nov 2014 17:08:33 +0000 (+0000)
Subject: bootstrap: make sure gnulib file droppings are removed.
X-Git-Tag: v2.4.4~12
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bedb0e786680ede6a9aae6ea7125fc9a232224c6;p=thirdparty%2Flibtool.git

bootstrap: make sure gnulib file droppings are removed.

* bootstrap.conf (libtool_cleanup_empty_dirs): Recent bootstrap
updates set source_base to null, so we need to use ${x:-y} to
override the null.  Autoconf Shellology says that ancient BSD
/bin/sh chokes on :- defaults, but bootstrap is a developer tool,
and so we can reasonably expect a developer to have a working
/bin/sh to run the bootstrap script.

Signed-off-by: Gary V. Vaughan <gary@gnu.org>
---

diff --git a/bootstrap.conf b/bootstrap.conf
index 2e99673c4..9606e6488 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -309,7 +309,8 @@ libtool_cleanup_empty_dirs ()
 {
     $debug_cmd
 
-    my_gnulib_source=${source_base-'lib'}
+    my_gnulib_source=${source_base:-'lib'}
+
     if test -d "$my_gnulib_source"; then
       rm -f "$my_gnulib_source/.gitignore" "$my_gnulib_source/Makefile.am" || exit 1
       rmdir "$my_gnulib_source" || exit 1