minor Makefile changes to force setting of SRCDIR and ordering of
	include files

Submitted by: Bruce Momjian (root@candle.pha.pa.us)
This commit is contained in:
Marc G. Fournier 1996-07-19 05:32:42 +00:00
parent 54857ad1a7
commit 2771129c82
2 changed files with 6 additions and 6 deletions

View File

@ -7,7 +7,7 @@
# #
# #
# IDENTIFICATION # IDENTIFICATION
# $Header: /cvsroot/pgsql/src/Attic/Makefile.global,v 1.4 1996/07/16 07:12:10 scrappy Exp $ # $Header: /cvsroot/pgsql/src/Attic/Makefile.global,v 1.5 1996/07/19 05:32:22 scrappy 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,6 +59,9 @@
# or the makefiles can get confused # or the makefiles can get confused
PORTNAME= BSD44_derived PORTNAME= BSD44_derived
# SRCDIR specifies where the source files are.
SRCDIR= <SET THIS VALUE>
# FreeBSD 2.1R with new Flex v2.5.2 in /usr/local # FreeBSD 2.1R with new Flex v2.5.2 in /usr/local
LEX = flex LEX = flex
LDADD+= -L/usr/local/lib -lfl LDADD+= -L/usr/local/lib -lfl
@ -79,9 +82,6 @@ POSTGRESLOGIN= postgres
# changable separately. # changable separately.
POSTGRESDIR= /home/staff/scrappy/cvs/postgres95 POSTGRESDIR= /home/staff/scrappy/cvs/postgres95
# SRCDIR specifies where the source files are.
SRCDIR= $(POSTGRESDIR)/src
# DATADIR specifies where the postmaster expects to find its database. # DATADIR specifies where the postmaster expects to find its database.
# This may be overridden by command line options or the PGDATA environment # This may be overridden by command line options or the PGDATA environment
# variable. # variable.

View File

@ -7,11 +7,11 @@
# #
# #
# IDENTIFICATION # IDENTIFICATION
# $Header: /cvsroot/pgsql/src/bin/Attic/Makefile.global,v 1.1.1.1 1996/07/09 06:22:11 scrappy Exp $ # $Header: /cvsroot/pgsql/src/bin/Attic/Makefile.global,v 1.2 1996/07/19 05:32:42 scrappy Exp $
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
CFLAGS+= -I$(HEADERDIR) -I$(srcdir)/backend -I$(srcdir)/backend/include -I$(srcdir)/libpq CFLAGS+= -I$(srcdir)/backend -I$(srcdir)/backend/include -I$(srcdir)/libpq -I$(HEADERDIR)
# #
# try locating libpq.a in the following places # try locating libpq.a in the following places