Clean up Makefile, make sure that postmaster.c compiles

diff --git a/src/backend/postmaster/Makefile b/src/backend/postmaster/Makefile
index 73b8e40..8115e61 100644 (file)
--- a/src/backend/postmaster/Makefile
+++ b/src/backend/postmaster/Makefile
@@ -4,16 +4,14 @@
 #    Makefile for postmaster
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/postmaster/Makefile,v 1.1 1996/10/27 09:51:20 bryanh Exp $
+#    $Header: /cvsroot/pgsql/src/backend/postmaster/Makefile,v 1.2 1996/11/03 04:48:27 scrappy Exp $
 #
 #-------------------------------------------------------------------------
 
 SRCDIR = ../..
 include ../../Makefile.global
 
-INCLUDE_OPT = -I.. \
-              -I../port/$(PORTNAME) \
-              -I../include \
+INCLUDE_OPT = -I../port/$(PORTNAME) \
               -I../../include
 
 CFLAGS+=$(INCLUDE_OPT)

diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c
index 1daf3c1..0f810b8 100644 (file)
--- 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.19 1996/10/30 00:36:59 bryanh Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.20 1996/11/03 04:48:26 scrappy Exp $
  *
  * NOTES
  *
@@ -32,8 +32,9 @@
  *
  *-------------------------------------------------------------------------
  */
+#include "postgres.h"
+
 #include "libpq/pqsignal.h"    /* substitute for <signal.h> */
-#include "config.h"
 
 #include <string.h>
 #include <stdlib.h>
@@ -73,6 +74,7 @@
 #include "libpq/pqcomm.h"
 #include "miscadmin.h"
 #include "lib/dllist.h"
+#include "nodes/nodes.h"
 #include "utils/mcxt.h"
 #include "storage/proc.h"
 #include "utils/elog.h"