From: Noah Misch <noah@leadboat.com>
Date: Fri, 31 Jul 2015 00:48:46 +0000 (-0400)
Subject: Clean up Makefile.win32 "-I" flag additions.
X-Git-Tag: REL9_6_BETA1~1579
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=16c4e6d8dc8fb98cd32d9af473fb06a730fb40d3;p=postgresql

Clean up Makefile.win32 "-I" flag additions.

The PGXS-case directory does not exist in the non-PGXS case, and vice
versa.  Add one or the other, not both.  This is essentially cosmetic.
It makes Makefile.win32 more like the similar Makefile.global code.
---

diff --git a/src/makefiles/Makefile.win32 b/src/makefiles/Makefile.win32
index b93f78067f..176c8b9d3f 100644
--- a/src/makefiles/Makefile.win32
+++ b/src/makefiles/Makefile.win32
@@ -1,12 +1,11 @@
 # src/makefiles/Makefile.win32
 
-# Use replacement include files for those missing on Win32
-override CPPFLAGS+="-I$(top_srcdir)/src/include/port/win32"
-
 ifdef PGXS
 BE_DLLLIBS= -L$(libdir) -lpostgres
+override CPPFLAGS+= -I$(includedir_server)/port/win32
 else
 BE_DLLLIBS= -L$(top_builddir)/src/backend -lpostgres
+override CPPFLAGS+="-I$(top_srcdir)/src/include/port/win32"
 endif
 
 AROPT = crs
@@ -44,11 +43,6 @@ ifneq (,$(findstring src/pl/plpython,$(subdir)))
 override CPPFLAGS+= -DUSE_DL_IMPORT
 endif
 
-# special win32 headers are provided here
-ifdef PGXS
-override CPPFLAGS+= -I$(includedir_server)/port/win32
-endif
-
 # it is better to install shared-libraries anyway?
 # may be overriden with make MAKE_DLL=false install
 ifndef MAKE_DLL