Bring in changes so that PORTNAME is UNDEFINED by default, and error/halt

happens if it isn't changed

Disable READLINE by default

diff --git a/src/Makefile b/src/Makefile
index fdf944df964b266883c95300dbcf1418e0f4757d..10b981ba30816350e690df24998f668b2cddd073 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -7,7 +7,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/Makefile,v 1.3.2.2 1996/08/20 04:10:35 scrappy Exp $
+#    $Header: /cvsroot/pgsql/src/Makefile,v 1.3.2.3 1996/10/25 09:23:42 scrappy Exp $
 #
 # NOTES
 #      objdir  - location of the objects and generated files (eg. obj)
@@ -26,6 +26,11 @@ ETAGS = etags
 XARGS = xargs
 
 .DEFAULT all:
+       @if test $(PORTNAME) = UNDEFINED; then \
+         echo You must set the PORTNAME value in Makefile.global before ;\
+         echo you can build Postgres. ;\
+         false ;\
+       fi
        $(MAKE) -C backend $@
        $(MAKE) -C libpq $@
 ifeq ($(USE_TCL), true)

diff --git a/src/Makefile.global b/src/Makefile.global
index cd2aaa64bf261ed4ec7a6714e7ee3e1edef120a4..59f95911a5b09f95d7817ec740e74f755d2fb690 100644 (file)
--- a/src/Makefile.global
+++ b/src/Makefile.global
@@ -7,7 +7,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/Attic/Makefile.global,v 1.19.2.10 1996/10/11 03:06:28 scrappy Exp $
+#    $Header: /cvsroot/pgsql/src/Attic/Makefile.global,v 1.19.2.11 1996/10/25 09:23:41 scrappy Exp $
 #
 # NOTES
 #    This is seen by any Makefiles that include mk/postgres.mk. To
@@ -60,7 +60,7 @@
 #  make sure that you have no whitespaces after the PORTNAME setting
 #  or the makefiles can get confused
 # 
-PORTNAME=      BSD44_derived
+PORTNAME=      UNDEFINED
 
 # SRCDIR specifies where the source files are. 
 SRCDIR=                /home/tools/postgres95-1.02/src