diff options
| author | Tom Lane | 2004-11-17 17:16:17 +0000 |
|---|---|---|
| committer | Tom Lane | 2004-11-17 17:16:17 +0000 |
| commit | e5f7a9f404236d4007d67c274db4d1b92a2d9897 (patch) | |
| tree | 9de96b575c7ad514642e70d7a23f514110df83b4 | |
| parent | 86b5545260be00aa2205b7b5d2266a6259b3770d (diff) | |
Install include/port header files, and fix PGXS build to use them.
Fabien COELHO
| -rw-r--r-- | src/include/Makefile | 5 | ||||
| -rw-r--r-- | src/makefiles/Makefile.win32 | 13 |
2 files changed, 15 insertions, 3 deletions
diff --git a/src/include/Makefile b/src/include/Makefile index 5271017d7d3..6d4d62898fd 100644 --- 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 index bac94505e17..92d6ce2e2c2 100644 --- 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 |