2003-02-10 Richard Dawe <rich@phekda.freeserve.co.uk>

	* Makefile.am: Substitute @SHELL@ in automake.in and aclocal.in.
	This makes the setting of SHELL work for DJGPP.

diff --git a/ChangeLog b/ChangeLog
index f1aad688e4327f49bda96bc04ba7455a21c2622c..d0c0ceca0db3468fe388d6bb1b56c474cad350e0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-02-10  Richard Dawe  <rich@phekda.freeserve.co.uk>
+
+       * Makefile.am: Substitute @SHELL@ in automake.in and aclocal.in.
+       This makes the setting of SHELL work for DJGPP.
+
 2003-02-10  Alexandre Duret-Lutz  <adl@gnu.org>
 
        For PR automake/385:

diff --git a/Makefile.am b/Makefile.am
index e0f5c263da8fe988175e9fedb1b2ebfea1e0a8d4..d33a53005fa847e62f5d7c9488fcb8a29186b6da 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -68,7 +68,8 @@ do_subst = sed -e 's,[@]datadir[@],$(datadir),g' -e 's,[@]PERL[@],$(PERL),g' \
            -e 's,[@]configure_input[@],@configure_input@,g' \
            -e 's,[@]PACKAGE[@],$(PACKAGE),g' \
            -e 's,[@]VERSION[@],$(VERSION),g' \
-           -e 's,[@]APIVERSION[@],$(APIVERSION),g'
+           -e 's,[@]APIVERSION[@],$(APIVERSION),g' \
+           -e 's,[@]SHELL[@],$(SHELL),g'
 
 automake: automake.in Makefile
        $(do_subst) < $(srcdir)/automake.in > automake

diff --git a/Makefile.in b/Makefile.in
index 0f0ec6d368abb674c3e8bb7f1b584898ce57d488..75eeb4bf24ca617f373793fde59ad891794df194 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -118,7 +118,8 @@ do_subst = sed -e 's,[@]datadir[@],$(datadir),g' -e 's,[@]PERL[@],$(PERL),g' \
            -e 's,[@]configure_input[@],@configure_input@,g' \
            -e 's,[@]PACKAGE[@],$(PACKAGE),g' \
            -e 's,[@]VERSION[@],$(VERSION),g' \
-           -e 's,[@]APIVERSION[@],$(APIVERSION),g'
+           -e 's,[@]APIVERSION[@],$(APIVERSION),g' \
+           -e 's,[@]SHELL[@],$(SHELL),g'
 
 
 WGET = wget