Commite5f7a9f

committed

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

Fabien COELHO

1 parent86b5545 commite5f7a9fCopy full SHA for e5f7a9f

File tree

+15

-3

lines changed

+15

-3

lines changed

Lines changed: 3 additions & 2 deletions

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`

Lines changed: 12 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-# $PostgreSQL: pgsql/src/makefiles/Makefile.win32,v 1.5 2004/10/27 19:14:07 momjian Exp $`
	`1`	`+# $PostgreSQL: pgsql/src/makefiles/Makefile.win32,v 1.6 2004/11/17 17:16:17 tgl Exp $`
`2`	`2`
`3`	`3`	`# Use replacement include files for those missing on Win32`
`4`	`4`	`override CPPFLAGS+="-I$(top_srcdir)/src/include/port/win32"`
`@@ -35,3 +35,14 @@ endif`
`35`	`35`	`ifneq (,$(findstring src/pl/plpython,$(subdir)))`
`36`	`36`	`override CPPFLAGS+= -DUSE_DL_IMPORT`
`37`	`37`	`endif`
	`38`	`+`
	`39`	`+# special win32 headers are provided here`
	`40`	`+ifdef PGXS`
	`41`	`+override CPPFLAGS+= -I$(includedir_server)/port/win32`
	`42`	`+endif`
	`43`	`+`
	`44`	`+# it is better to install shared-libraries anyway?`
	`45`	`+# may be overriden with make MAKE_DLL=false install`
	`46`	`+ifndef MAKE_DLL`
	`47`	`+MAKE_DLL= true`
	`48`	`+endif`

Comments

(0)