Allow SHELL in Makefile.* to control initdb.

diff --git a/src/bin/initdb/Makefile b/src/bin/initdb/Makefile
index 8e1fc19c71fe4e4f252e892c053524487098e815..7bce5e4781e9cd8d18bbf56e98d7f0a4f55c3e6a 100644 (file)
--- a/src/bin/initdb/Makefile
+++ b/src/bin/initdb/Makefile
@@ -5,7 +5,7 @@
 # Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
 # Portions Copyright (c) 1994, Regents of the University of California
 #
-# $Header: /cvsroot/pgsql/src/bin/initdb/Makefile,v 1.25 2001/02/18 18:33:59 momjian Exp $
+# $Header: /cvsroot/pgsql/src/bin/initdb/Makefile,v 1.26 2001/05/08 16:28:46 momjian Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -18,6 +18,7 @@ all: initdb
 initdb: initdb.sh $(top_builddir)/src/Makefile.global
        sed -e 's/@MULTIBYTE@/$(MULTIBYTE)/g' \
            -e 's/@VERSION@/$(VERSION)/g' \
+           -e 's,@SHELL@,$(SHELL),g' \
            -e 's,@bindir@,$(bindir),g' \
            -e 's,@datadir@,$(datadir),g' \
          $< >$@

diff --git a/src/bin/initdb/initdb.sh b/src/bin/initdb/initdb.sh
index 68bde7c523f9962c491ee9e879489a5565007bbd..b00a4bf5718f0ad1f43f132b308c3c59b41d644d 100644 (file)
--- a/src/bin/initdb/initdb.sh
+++ b/src/bin/initdb/initdb.sh
@@ -1,4 +1,4 @@
-#! /bin/sh
+#!@SHELL@
 #-------------------------------------------------------------------------
 #
 # initdb creates (initializes) a PostgreSQL database cluster (site,
@@ -23,7 +23,7 @@
 # Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
 # Portions Copyright (c) 1994, Regents of the University of California
 #
-# $Header: /cvsroot/pgsql/src/bin/initdb/Attic/initdb.sh,v 1.123 2001/03/27 05:45:50 ishii Exp $
+# $Header: /cvsroot/pgsql/src/bin/initdb/Attic/initdb.sh,v 1.124 2001/05/08 16:28:46 momjian Exp $
 #
 #-------------------------------------------------------------------------