diff options
| author | Noah Misch <noah@leadboat.com> | 2015-07-30 20:48:46 -0400 |
|---|---|---|
| committer | Noah Misch <noah@leadboat.com> | 2015-07-30 20:48:46 -0400 |
| commit | 16c4e6d8dc8fb98cd32d9af473fb06a730fb40d3 (patch) | |
| tree | a5edfdf238c5d24268d6b113aaf6daac7c3d7845 | |
| parent | 5da944fb4683762b8ccebbf7599f79db01e63132 (diff) | |
| download | postgresql-16c4e6d8dc8fb98cd32d9af473fb06a730fb40d3.tar.gz postgresql-16c4e6d8dc8fb98cd32d9af473fb06a730fb40d3.zip | |
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.
| -rw-r--r-- | src/makefiles/Makefile.win32 | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/src/makefiles/Makefile.win32 b/src/makefiles/Makefile.win32 index b93f78067f2..176c8b9d3fc 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 |