* top/GNUmakefile: Use $(wildcard) instead of $(shell) to determine
whether the tree make is being run from is already configured or
not. Related simplifications.
---
ChangeLog | 7 +++++++
top/GNUmakefile | 14 ++------------
2 files changed, 9 insertions(+), 12 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index ca738bf..49c12ad 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2012-02-16 Stefano Lattarini <stefano.lattar...@gmail.com>
+
+ GNUmakefile: simplify detection of unconfigured trees
+ * top/GNUmakefile: Use $(wildcard) instead of $(shell) to determine
+ whether the tree make is being run from is already configured or
+ not. Related simplifications.
+
2012-02-13 Simon Josefsson <si...@josefsson.org>
* gnulib-tool (Usage): Document --help and --version.
diff --git a/top/GNUmakefile b/top/GNUmakefile
index d0fd3e8..58f2ead 100644
--- a/top/GNUmakefile
+++ b/top/GNUmakefile
@@ -20,20 +20,10 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-# Systems where /bin/sh is not the default shell need this. The $(shell)
-# command below won't work with e.g. stock DOS/Windows shells.
-ifeq ($(wildcard /bin/s[h]),/bin/sh)
-SHELL = /bin/sh
-else
-# will be used only with the next shell-test line, then overwritten
-# by a configured-in value
-SHELL = sh
-endif
-
# If the user runs GNU make but has not yet run ./configure,
# give them a diagnostic.
-_have-Makefile := $(shell test -f Makefile && echo yes)
-ifeq ($(_have-Makefile),yes)
+_gl-Makefile := $(wildcard [M]akefile)
+ifneq ($(_gl-Makefile),)
# Make tar archive easier to reproduce.
export TAR_OPTIONS = --owner=0 --group=0 --numeric-owner
--
1.7.9
