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

Commit e5f7a9f

Browse files
committed
Install include/port header files, and fix PGXS build to use them.
Fabien COELHO
1 parent 86b5545 commit e5f7a9f

File tree

2 files changed

+15
-3
lines changed

2 files changed

+15
-3
lines changed

src/include/Makefile

+3-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#
55
# 'make install' installs whole contents of src/include.
66
#
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 $
88
#
99
#-------------------------------------------------------------------------
1010

@@ -18,7 +18,8 @@ all: pg_config.h pg_config_os.h
1818

1919
# Subdirectories containing headers for server-side dev
2020
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
2223

2324
# Install all headers
2425
install: all installdirs

src/makefiles/Makefile.win32

+12-1
Original file line numberDiff line numberDiff 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 $
22

33
# Use replacement include files for those missing on Win32
44
override CPPFLAGS+="-I$(top_srcdir)/src/include/port/win32"
@@ -35,3 +35,14 @@ endif
3535
ifneq (,$(findstring src/pl/plpython,$(subdir)))
3636
override CPPFLAGS+= -DUSE_DL_IMPORT
3737
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

0 commit comments

Comments
 (0)