From 15753f052d16536388d62ea3d34b20f87f74efa2 Mon Sep 17 00:00:00 2001 From: Akim Demaille Date: Tue, 8 Apr 2003 07:42:14 +0000 Subject: [PATCH] * GNUmakefile (SHELL): Don't assume sh is in /bin/. From Ilya Zakharevich. --- ChangeLog | 5 +++++ GNUmakefile | 6 ++++++ THANKS | 1 + 3 files changed, 12 insertions(+) diff --git a/ChangeLog b/ChangeLog index c9f968f63..c7496b837 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2003-04-08 Akim Demaille + + * GNUmakefile (SHELL): Don't assume sh is in /bin/. + From Ilya Zakharevich. + 2003-04-08 Akim Demaille * doc/autoconf.texi (Particular Headers): Some about sys/socket.h, diff --git a/GNUmakefile b/GNUmakefile index 4a8d2484b..d6465a537 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -22,7 +22,13 @@ # 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 have-Makefile := $(shell test -f Makefile && echo yes) diff --git a/THANKS b/THANKS index 0bbe361e0..bb79745d2 100644 --- a/THANKS +++ b/THANKS @@ -78,6 +78,7 @@ Harlan Stenn stenn@whimsy.udel.edu H.J. Lu hjl@gnu.org H. Merijn Brand h.m.brand@hccnet.nl Ian Lance Taylor ian@cygnus.com +Ilya Zakharevich ilya@Math.Berkeley.EDU James A. Lupo lupoja@feynman.ml.wpafb.af.mil Jason Molenda jsm@cygnus.com Jeff Garzik jgarzik@pobox.com -- 2.47.3