Install include/port header files, and fix PGXS build to use them.

tglsfdc · tglsfdc · commit e5f7a9f40423 · 2004-11-17T17:16:17.000Z
Fabien COELHO
diff --git a/src/include/Makefile b/src/include/Makefile
@@ -4,7 +4,7 @@
 #
 # 'make install' installs whole contents of src/include.
 #
-# $PostgreSQL: pgsql/src/include/Makefile,v 1.17 2004/11/09 06:23:50 neilc Exp $
+# $PostgreSQL: pgsql/src/include/Makefile,v 1.18 2004/11/17 17:16:13 tgl Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -18,7 +18,8 @@ all: pg_config.h pg_config_os.h
 
 # Subdirectories containing headers for server-side dev
 SUBDIRS = access bootstrap catalog commands executor lib libpq mb \
-	nodes optimizer parser port regex rewrite storage tcop utils
+	nodes optimizer parser port regex rewrite storage tcop utils \
+	port port/win32 port/win32/arpa port/win32/netinet port/win32/sys
 
 # Install all headers
 install: all installdirs
diff --git a/src/makefiles/Makefile.win32 b/src/makefiles/Makefile.win32
@@ -1,4 +1,4 @@
-# $PostgreSQL: pgsql/src/makefiles/Makefile.win32,v 1.5 2004/10/27 19:14:07 momjian Exp $
+# $PostgreSQL: pgsql/src/makefiles/Makefile.win32,v 1.6 2004/11/17 17:16:17 tgl Exp $
 
 # Use replacement include files for those missing on Win32
 override CPPFLAGS+="-I$(top_srcdir)/src/include/port/win32"
@@ -35,3 +35,14 @@ endif
 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
+MAKE_DLL	= true
+endif

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`#`
`5`	`5`	`# 'make install' installs whole contents of src/include.`
`6`	`6`	`#`
`7`		`-# $PostgreSQL: pgsql/src/include/Makefile,v 1.17 2004/11/09 06:23:50 neilc Exp $`
	`7`	`+# $PostgreSQL: pgsql/src/include/Makefile,v 1.18 2004/11/17 17:16:13 tgl Exp $`
`8`	`8`	`#`
`9`	`9`	`#-------------------------------------------------------------------------`
`10`	`10`
`@@ -18,7 +18,8 @@ all: pg_config.h pg_config_os.h`
`18`	`18`
`19`	`19`	`# Subdirectories containing headers for server-side dev`
`20`	`20`	`SUBDIRS = access bootstrap catalog commands executor lib libpq mb \`
`21`		`- nodes optimizer parser port regex rewrite storage tcop utils`
	`21`	`+ nodes optimizer parser port regex rewrite storage tcop utils \`
	`22`	`+ port port/win32 port/win32/arpa port/win32/netinet port/win32/sys`
`22`	`23`
`23`	`24`	`# Install all headers`
`24`	`25`	`install: all installdirs`