diff options
| author | Bruce Momjian | 1998-04-06 00:32:26 +0000 |
|---|---|---|
| committer | Bruce Momjian | 1998-04-06 00:32:26 +0000 |
| commit | 1e801a8f16ae0b308ac3aea88dddcb676f412580 (patch) | |
| tree | 8550c33916f565375f815c7e6c1826f620778374 /src/backend/bootstrap | |
| parent | 2dfee9345773e6ac8809396bf99db538e134fea8 (diff) | |
Hi,
Attached you'll find a (big) patch that fixes make dep and make
depend in all Makefiles where I found it to be appropriate.
It also removes the dependency in Makefile.global for NAMEDATALEN
and OIDNAMELEN by making backend/catalog/genbki.sh and bin/initdb/initdb.sh
a little smarter.
This no longer requires initdb.sh that is turned into initdb with
a sed script when installing Postgres, hence initdb.sh should be
renamed to initdb (after the patch has been applied :-) )
This patch is against the 6.3 sources, as it took a while to
complete.
Please review and apply,
Cheers,
Jeroen van Vianen
Diffstat (limited to 'src/backend/bootstrap')
| -rw-r--r-- | src/backend/bootstrap/Makefile | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/backend/bootstrap/Makefile b/src/backend/bootstrap/Makefile index 8835803b733..b172c4d267b 100644 --- a/src/backend/bootstrap/Makefile +++ b/src/backend/bootstrap/Makefile @@ -4,7 +4,7 @@ # Makefile for the bootstrap module # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/bootstrap/Makefile,v 1.12 1997/12/20 00:23:19 scrappy Exp $ +# $Header: /cvsroot/pgsql/src/backend/bootstrap/Makefile,v 1.13 1998/04/06 00:22:02 momjian Exp $ # # # We must build bootparse.c and bootscanner.c with yacc and lex and sed, @@ -21,9 +21,7 @@ SRCDIR= ../.. include ../../Makefile.global -INCLUDE_OPT= -I.. - -CFLAGS+= $(INCLUDE_OPT) +CFLAGS += -I.. ifeq ($(CC), gcc) CFLAGS+= -Wno-error @@ -65,8 +63,8 @@ clean: # This is unusual: We actually have to build some of the parts before # we know what the header file dependencies are. -dep: bootparse.c bootscanner.c bootstrap_tokens.h - $(CC) -MM $(INCLUDE_OPT) *.c >depend +dep depend: bootparse.c bootscanner.c bootstrap_tokens.h + $(CC) -MM $(CFLAGS) *.c >depend ifeq (depend,$(wildcard depend)) include depend |