Commit 1363ca1d authored by Bryan Henderson's avatar Bryan Henderson

Force user to set PORTNAME. Remove NAMEDATALEN from CFLAGS (don't need it

there because it's in config.h, which is cleaner).
parent b446f385
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
# #
# #
# IDENTIFICATION # 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 # NOTES
# objdir - location of the objects and generated files (eg. obj) # objdir - location of the objects and generated files (eg. obj)
...@@ -26,6 +26,11 @@ ETAGS = etags ...@@ -26,6 +26,11 @@ ETAGS = etags
XARGS = xargs XARGS = xargs
.DEFAULT all: .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 backend $@
$(MAKE) -C libpq $@ $(MAKE) -C libpq $@
ifeq ($(HAVE_Cplusplus), true) ifeq ($(HAVE_Cplusplus), true)
...@@ -38,7 +43,6 @@ endif ...@@ -38,7 +43,6 @@ endif
ifneq ($(wildcard $(MKDIR)/../../doc), ) ifneq ($(wildcard $(MKDIR)/../../doc), )
$(MAKE) -C ../doc $@ $(MAKE) -C ../doc $@
endif endif
@-chown -R $(POSTGRESLOGIN) $(POSTGRESDIR) 2>/dev/null
@if test $@. = all. -o $@. = .; then \ @if test $@. = all. -o $@. = .; then \
echo All of Postgres95 is successfully made. Ready to install. ;\ echo All of Postgres95 is successfully made. Ready to install. ;\
fi fi
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
# #
# #
# IDENTIFICATION # 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 # NOTES
# This is seen by any Makefiles that include mk/postgres.mk. To # This is seen by any Makefiles that include mk/postgres.mk. To
...@@ -59,7 +59,7 @@ ...@@ -59,7 +59,7 @@
# until after this file is processed! # until after this file is processed!
# make sure that you have no whitespaces after the PORTNAME setting # make sure that you have no whitespaces after the PORTNAME setting
# or the makefiles can get confused # or the makefiles can get confused
PORTNAME= BSD44_derived PORTNAME= UNDEFINED
# SRCDIR specifies where the source files are. # SRCDIR specifies where the source files are.
SRCDIR= /usr/local/postgres95/src SRCDIR= /usr/local/postgres95/src
...@@ -117,12 +117,13 @@ POSTPORT= 5432 ...@@ -117,12 +117,13 @@ POSTPORT= 5432
# #
# NOTE also that databases with different NAMEDATALEN's cannot interoperate! # 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 NAMEDATALEN = 32
# OIDNAMELEN should be set to NAMEDATALEN + sizeof(Oid) # OIDNAMELEN should be set to NAMEDATALEN + sizeof(Oid)
OIDNAMELEN = 36 OIDNAMELEN = 36
CFLAGS+= -DNAMEDATALEN=$(NAMEDATALEN) -DOIDNAMELEN=$(OIDNAMELEN)
############################################################################## ##############################################################################
# #
# FEATURES # FEATURES
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment