Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 1363ca1

Browse files
author
Bryan Henderson
committed
Force user to set PORTNAME. Remove NAMEDATALEN from CFLAGS (don't need it
there because it's in config.h, which is cleaner).
1 parent b446f38 commit 1363ca1

File tree

2 files changed

+11
-6
lines changed

2 files changed

+11
-6
lines changed

src/Makefile

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#
88
#
99
# IDENTIFICATION
10-
# $Header: /cvsroot/pgsql/src/Makefile,v 1.8 1996/10/19 06:33:52 scrappy Exp $
10+
# $Header: /cvsroot/pgsql/src/Makefile,v 1.9 1996/10/21 06:56:55 bryanh Exp $
1111
#
1212
# NOTES
1313
# objdir - location of the objects and generated files (eg. obj)
@@ -26,6 +26,11 @@ ETAGS = etags
2626
XARGS = xargs
2727

2828
.DEFAULT all:
29+
@if test $(PORTNAME) = UNDEFINED; then \
30+
echo You must set the PORTNAME value in Makefile.global before \
31+
you can build Postgres. ;\
32+
false ;\
33+
fi
2934
$(MAKE) -C backend $@
3035
$(MAKE) -C libpq $@
3136
ifeq ($(HAVE_Cplusplus), true)
@@ -38,7 +43,6 @@ endif
3843
ifneq ($(wildcard $(MKDIR)/../../doc), )
3944
$(MAKE) -C ../doc $@
4045
endif
41-
@-chown -R $(POSTGRESLOGIN) $(POSTGRESDIR) 2>/dev/null
4246
@if test $@. = all. -o $@. = .; then \
4347
echo All of Postgres95 is successfully made. Ready to install. ;\
4448
fi

src/Makefile.global

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#
88
#
99
# IDENTIFICATION
10-
# $Header: /cvsroot/pgsql/src/Attic/Makefile.global,v 1.40 1996/10/19 06:33:55 scrappy Exp $
10+
# $Header: /cvsroot/pgsql/src/Attic/Makefile.global,v 1.41 1996/10/21 06:56:57 bryanh Exp $
1111
#
1212
# NOTES
1313
# This is seen by any Makefiles that include mk/postgres.mk. To
@@ -59,7 +59,7 @@
5959
# until after this file is processed!
6060
# make sure that you have no whitespaces after the PORTNAME setting
6161
# or the makefiles can get confused
62-
PORTNAME= BSD44_derived
62+
PORTNAME= UNDEFINED
6363

6464
# SRCDIR specifies where the source files are.
6565
SRCDIR= /usr/local/postgres95/src
@@ -117,12 +117,13 @@ POSTPORT= 5432
117117
#
118118
# NOTE also that databases with different NAMEDATALEN's cannot interoperate!
119119
#
120+
# THERE ARE REDUNDANT DEFINITIONS OF THESE VALUES IN config.h.
121+
# Don't change anything here without changing it there too.
122+
120123
NAMEDATALEN = 32
121124
# OIDNAMELEN should be set to NAMEDATALEN + sizeof(Oid)
122125
OIDNAMELEN = 36
123126

124-
CFLAGS+= -DNAMEDATALEN=$(NAMEDATALEN) -DOIDNAMELEN=$(OIDNAMELEN)
125-
126127
##############################################################################
127128
#
128129
# FEATURES

0 commit comments

Comments
 (0)