diff options
| -rw-r--r-- | contrib/hstore_plperl/Makefile | 10 | ||||
| -rw-r--r-- | src/pl/plperl/GNUmakefile | 2 |
2 files changed, 7 insertions, 5 deletions
diff --git a/contrib/hstore_plperl/Makefile b/contrib/hstore_plperl/Makefile index 39756c1a84a..569c579c940 100644 --- a/contrib/hstore_plperl/Makefile +++ b/contrib/hstore_plperl/Makefile @@ -3,7 +3,12 @@ MODULE_big = hstore_plperl OBJS = hstore_plperl.o -PG_CPPFLAGS = -I$(top_srcdir)/src/pl/plperl -I$(top_srcdir)/contrib/hstore +PG_CPPFLAGS = -I$(top_srcdir)/src/pl/plperl -I$(top_srcdir)/contrib/hstore -I$(perl_archlibexp)/CORE + +# see plperl +ifeq ($(PORTNAME), win32) +PG_CPPFLAGS += -DPLPERL_HAVE_UID_GID -Wno-comment +endif EXTENSION = hstore_plperl hstore_plperlu DATA = hstore_plperl--1.0.sql hstore_plperlu--1.0.sql @@ -21,6 +26,3 @@ top_builddir = ../.. include $(top_builddir)/src/Makefile.global include $(top_srcdir)/contrib/contrib-global.mk endif - -override CPPFLAGS := $(CPPFLAGS) -I$(perl_archlibexp)/CORE -DPLPERL_HAVE_UID_GID -override CFLAGS += -Wno-comment diff --git a/src/pl/plperl/GNUmakefile b/src/pl/plperl/GNUmakefile index 6e1377b53de..b8e35852544 100644 --- a/src/pl/plperl/GNUmakefile +++ b/src/pl/plperl/GNUmakefile @@ -9,7 +9,7 @@ ifeq ($(PORTNAME), win32) override CPPFLAGS += -DPLPERL_HAVE_UID_GID # Perl on win32 contains /* within comment all over the header file, # so disable this warning. -override CFLAGS += -Wno-comment +override CPPFLAGS += -Wno-comment endif override CPPFLAGS := -I. -I$(srcdir) $(CPPFLAGS) -I$(perl_archlibexp)/CORE |