diff options
| author | Marc G. Fournier | 1997-12-19 02:09:10 +0000 |
|---|---|---|
| committer | Marc G. Fournier | 1997-12-19 02:09:10 +0000 |
| commit | 5379b84eff3ae207635d7ac9527b0a3f5eb272e7 (patch) | |
| tree | 84d6a71200ffe5edf43596bc2fbf3276737e086a /src/backend/postmaster | |
| parent | 30856a390457682db4f8577e9f5a7f8521839c6f (diff) | |
More cleanups. I can now compile without PORTNAME being defined n
Makefile.global.
End result, if all goes well, should allow for much easier porting, since
there will no longer be a concept of a "port". Most, if not everything,
*should* be determined by configure, or by the compiler itself. Still
work to be done though :)
Diffstat (limited to 'src/backend/postmaster')
| -rw-r--r-- | src/backend/postmaster/Makefile | 10 | ||||
| -rw-r--r-- | src/backend/postmaster/postmaster.c | 6 |
2 files changed, 10 insertions, 6 deletions
diff --git a/src/backend/postmaster/Makefile b/src/backend/postmaster/Makefile index 115a403d3a4..a04ca75871c 100644 --- a/src/backend/postmaster/Makefile +++ b/src/backend/postmaster/Makefile @@ -4,16 +4,18 @@ # Makefile for postmaster # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/postmaster/Makefile,v 1.5 1997/04/02 18:12:39 scrappy Exp $ +# $Header: /cvsroot/pgsql/src/backend/postmaster/Makefile,v 1.6 1997/12/19 02:06:34 scrappy Exp $ # #------------------------------------------------------------------------- SRCDIR = ../.. include ../../Makefile.global -INCLUDE_OPT = -I.. \ - -I../port/$(PORTNAME) \ - -I../../include +INCLUDE_OPT = -I.. + +ifdef PORTNAME +INCLUDE_OPT+=-I../port/$(PORTNAME) +endif CFLAGS+=$(INCLUDE_OPT) diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c index fc2a83264a0..724a807c393 100644 --- a/src/backend/postmaster/postmaster.c +++ b/src/backend/postmaster/postmaster.c @@ -10,7 +10,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.67 1997/12/15 22:03:59 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.68 1997/12/19 02:06:37 scrappy Exp $ * * NOTES * @@ -87,7 +87,9 @@ #include "utils/mcxt.h" #include "storage/proc.h" #include "utils/elog.h" -#include "port-protos.h" /* For gethostname() */ +#ifndef HAVE_GETHOSTNAME +# include "port-protos.h" /* For gethostname() */ +#endif #include "storage/fd.h" #if defined(DBX_VERSION) |