From 1363ca1d52ac7a2edb17cd004d95e00b291c0f47 Mon Sep 17 00:00:00 2001
From: Bryan Henderson <bryanh@giraffe.netgate.net>
Date: Mon, 21 Oct 1996 06:56:57 +0000
Subject: [PATCH] Force user to set PORTNAME. Remove NAMEDATALEN from CFLAGS
(don't need it there because it's in config.h, which is cleaner).
---
src/Makefile | 8 ++++++--
src/Makefile.global | 9 +++++----
2 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/src/Makefile b/src/Makefile
index 548af888db8..e1cfcd076fc 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -7,7 +7,7 @@
#
#
# IDENTIFICATION
-# $Header: /cvsroot/pgsql/src/Makefile,v 1.8 1996/10/19 06:33:52 scrappy Exp $
+# $Header: /cvsroot/pgsql/src/Makefile,v 1.9 1996/10/21 06:56:55 bryanh 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 \
+ you can build Postgres. ;\
+ false ;\
+ fi
$(MAKE) -C backend $@
$(MAKE) -C libpq $@
ifeq ($(HAVE_Cplusplus), true)
@@ -38,7 +43,6 @@ endif
ifneq ($(wildcard $(MKDIR)/../../doc), )
$(MAKE) -C ../doc $@
endif
- @-chown -R $(POSTGRESLOGIN) $(POSTGRESDIR) 2>/dev/null
@if test $@. = all. -o $@. = .; then \
echo All of Postgres95 is successfully made. Ready to install. ;\
fi
diff --git a/src/Makefile.global b/src/Makefile.global
index 1b13f7076a9..9cbfe1ecc71 100644
--- a/src/Makefile.global
+++ b/src/Makefile.global
@@ -7,7 +7,7 @@
#
#
# IDENTIFICATION
-# $Header: /cvsroot/pgsql/src/Attic/Makefile.global,v 1.40 1996/10/19 06:33:55 scrappy Exp $
+# $Header: /cvsroot/pgsql/src/Attic/Makefile.global,v 1.41 1996/10/21 06:56:57 bryanh Exp $
#
# NOTES
# This is seen by any Makefiles that include mk/postgres.mk. To
@@ -59,7 +59,7 @@
# until after this file is processed!
# 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= /usr/local/postgres95/src
@@ -117,12 +117,13 @@ POSTPORT= 5432
#
# NOTE also that databases with different NAMEDATALEN's cannot interoperate!
#
+# THERE ARE REDUNDANT DEFINITIONS OF THESE VALUES IN config.h.
+# Don't change anything here without changing it there too.
+
NAMEDATALEN = 32
# OIDNAMELEN should be set to NAMEDATALEN + sizeof(Oid)
OIDNAMELEN = 36
-CFLAGS+= -DNAMEDATALEN=$(NAMEDATALEN) -DOIDNAMELEN=$(OIDNAMELEN)
-
##############################################################################
#
# FEATURES
--
GitLab