Makefile cleaned up

scrappy · scrappy · commit 9ef6b32c4711 · 1997-12-17T04:44:50.000Z
async.c: #include &lt;port-protos.h&gt; surrounded by an #ifdef HAVE_STRDUP

vacuum.c: #include &lt;port-protos.h&gt; commented out...can someone comment as
          to why it was included, as it doesn't seem to have any effect
          under FreeBSD so far...would like some sort of #ifdef wrapper
          like async.c if possible
diff --git a/src/backend/commands/Makefile b/src/backend/commands/Makefile
@@ -4,16 +4,18 @@
 #    Makefile for commands
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/commands/Makefile,v 1.8 1997/12/04 00:26:44 scrappy Exp $
+#    $Header: /cvsroot/pgsql/src/backend/commands/Makefile,v 1.9 1997/12/17 04:44:47 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/commands/async.c b/src/backend/commands/async.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/commands/async.c,v 1.25 1997/12/06 22:56:24 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/async.c,v 1.26 1997/12/17 04:44:49 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -82,7 +82,9 @@
 #include <commands/async.h>
 #include <libpq/libpq.h>
 
-#include <port-protos.h>		/* for strdup() */
+#ifndef HAVE_STRDUP
+#  include <port-protos.h>		/* for strdup() */
+#endif
 
 #include <storage/lmgr.h>
 
diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/commands/vacuum.c,v 1.53 1997/11/25 21:59:09 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/vacuum.c,v 1.54 1997/12/17 04:44:50 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -54,7 +54,7 @@
 #include <sys/resource.h>
 #endif
 
-#include <port-protos.h>
+/* #include <port-protos.h> */
 
 extern int BlowawayRelationBuffers(Relation rdesc, BlockNumber block);
 

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`*`
`8`	`8`	`*`
`9`	`9`	`* IDENTIFICATION`
`10`		`- * $Header: /cvsroot/pgsql/src/backend/commands/async.c,v 1.25 1997/12/06 22:56:24 momjian Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/backend/commands/async.c,v 1.26 1997/12/17 04:44:49 scrappy Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -82,7 +82,9 @@`
`82`	`82`	`#include <commands/async.h>`
`83`	`83`	`#include <libpq/libpq.h>`
`84`	`84`
`85`		`-#include <port-protos.h> /* for strdup() */`
	`85`	`+#ifndef HAVE_STRDUP`
	`86`	`+# include <port-protos.h> /* for strdup() */`
	`87`	`+#endif`
`86`	`88`
`87`	`89`	`#include <storage/lmgr.h>`
`88`	`90`