summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBruce Momjian2001-05-08 16:28:46 +0000
committerBruce Momjian2001-05-08 16:28:46 +0000
commit062a79a9900e7012e0eada333f209203ed433b31 (patch)
treeccd005ffb7b0d4f77463a21a4893e688762eec61 /src
parent70c10457198eccbd6f51c8ab96627facdd948e68 (diff)
Allow SHELL in Makefile.* to control initdb.
Diffstat (limited to 'src')
-rw-r--r--src/bin/initdb/Makefile3
-rw-r--r--src/bin/initdb/initdb.sh4
2 files changed, 4 insertions, 3 deletions
diff --git a/src/bin/initdb/Makefile b/src/bin/initdb/Makefile
index 8e1fc19c71f..7bce5e4781e 100644
--- 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 68bde7c523f..b00a4bf5718 100644
--- 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 $
#
#-------------------------------------------------------------------------