Add ability to change installation directory in build, prior to configure

diff --git a/src/Makefile.global.in b/src/Makefile.global.in
index edaa3f94f3bfdc87f2a721a7f8405db20f47bbf6..bb21d7d38c31cc09f74bc1b1988d6a6cfc858a91 100644 (file)
--- a/src/Makefile.global.in
+++ b/src/Makefile.global.in
@@ -7,7 +7,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.13 1997/03/25 07:16:30 scrappy Exp $
+#    $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.14 1997/03/26 06:53:57 scrappy Exp $
 #
 # NOTES
 #    Essentially all Postgres make files include this file and use the 
@@ -82,7 +82,7 @@ LIBPQDIR:= $(SRCDIR)/libpq
 # For convenience, POSTGRESDIR is where BINDIR, and LIBDIR 
 # and other target destinations are rooted.  Of course, each of these is 
 # changable separately.
-POSTGRESDIR= /usr/local/pgsql
+POSTGRESDIR= @prefix@
 
 # Where the postgres executables live (changeable by just putting them
 # somewhere else and putting that directory in your shell PATH)

diff --git a/src/build b/src/build
index e68deaea8ff736499afb995cb712f6c3f8dca008..b934369d42aba2dca00c4d060853b0575dbaeff5 100644 (file)
--- a/src/build
+++ b/src/build
@@ -30,5 +30,14 @@ then
         LDFLAGS="$ADD_LIB_DIRS" ; export LDFLAGS
 fi
 
-./configure
+$ECHO_N "Installation directory [/usr/local/pgsql]: $ECHO_C"
+read a
+if [ "$a." != "." ]
+then
+        IDIR=${a}
+else
+       IDIR=/usr/local/pgsql
+fi
+
+./configure --prefix=${IDIR}