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

scrappy · scrappy · commit f69b84641a04 · 1996-10-25T09:23:42.000Z
happens if it isn't changed

Disable READLINE by default
diff --git 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
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`#`
`8`	`8`	`#`
`9`	`9`	`# IDENTIFICATION`
`10`		`-# $Header: /cvsroot/pgsql/src/Makefile,v 1.3.2.2 1996/08/20 04:10:35 scrappy Exp $`
	`10`	`+# $Header: /cvsroot/pgsql/src/Makefile,v 1.3.2.3 1996/10/25 09:23:42 scrappy Exp $`
`11`	`11`	`#`
`12`	`12`	`# NOTES`
`13`	`13`	`# objdir - location of the objects and generated files (eg. obj)`
`@@ -26,6 +26,11 @@ ETAGS = etags`
`26`	`26`	`XARGS = xargs`
`27`	`27`
`28`	`28`	`.DEFAULT all:`
	`29`	`+ @if test $(PORTNAME) = UNDEFINED; then \`
	`30`	`+ echo You must set the PORTNAME value in Makefile.global before ;\`
	`31`	`+ echo you can build Postgres. ;\`
	`32`	`+ false ;\`
	`33`	`+ fi`
`29`	`34`	`$(MAKE) -C backend $@`
`30`	`35`	`$(MAKE) -C libpq $@`
`31`	`36`	`ifeq ($(USE_TCL), true)`