Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 16c4e6d

Browse files
committed
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.
1 parent 5da944f commit 16c4e6d

File tree

1 file changed

+2
-8
lines changed

1 file changed

+2
-8
lines changed

src/makefiles/Makefile.win32

+2-8
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
# src/makefiles/Makefile.win32
22

3-
# Use replacement include files for those missing on Win32
4-
override CPPFLAGS+="-I$(top_srcdir)/src/include/port/win32"
5-
63
ifdef PGXS
74
BE_DLLLIBS= -L$(libdir) -lpostgres
5+
override CPPFLAGS+= -I$(includedir_server)/port/win32
86
else
97
BE_DLLLIBS= -L$(top_builddir)/src/backend -lpostgres
8+
override CPPFLAGS+="-I$(top_srcdir)/src/include/port/win32"
109
endif
1110

1211
AROPT = crs
@@ -44,11 +43,6 @@ ifneq (,$(findstring src/pl/plpython,$(subdir)))
4443
override CPPFLAGS+= -DUSE_DL_IMPORT
4544
endif
4645

47-
# special win32 headers are provided here
48-
ifdef PGXS
49-
override CPPFLAGS+= -I$(includedir_server)/port/win32
50-
endif
51-
5246
# it is better to install shared-libraries anyway?
5347
# may be overriden with make MAKE_DLL=false install
5448
ifndef MAKE_DLL

0 commit comments

Comments
 (0)