diff options
author | Marc G. Fournier <scrappy@hub.org> | 1996-10-25 09:23:42 +0000 |
---|---|---|
committer | Marc G. Fournier <scrappy@hub.org> | 1996-10-25 09:23:42 +0000 |
commit | f69b84641a0435a3c5aa98191b2023d8e7348630 (patch) | |
tree | 39c9eb12e97b8298097d66d52906ea0f8430d6f5 | |
parent | 5d90a0037e8b7f7e573c3b700d46b269d8a874f3 (diff) | |
download | postgresql-f69b84641a0435a3c5aa98191b2023d8e7348630.tar.gz |
Bring in changes so that PORTNAME is UNDEFINED by default, and error/halt
happens if it isn't changed
Disable READLINE by default
-rw-r--r-- | src/Makefile | 7 | ||||
-rw-r--r-- | src/Makefile.global | 4 |
2 files changed, 8 insertions, 3 deletions
diff --git a/src/Makefile b/src/Makefile index fdf944df96..10b981ba30 100644 --- 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 cd2aaa64bf..59f95911a5 100644 --- 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 |