Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

- Adjust the makefiles to ensure PKGLIBDIR and DLSUFFIX are defined

  to non-empty strings before trying to use them.
  • Loading branch information...
commit b15f6609ceb0a45ca7159d85e45070e97fe37a45 1 parent 907f79e
jconway authored
Showing with 8 additions and 8 deletions.
  1. +4 −4 Makefile
  2. +4 −4 Makefile.pgxs
View
8 Makefile
@@ -29,10 +29,6 @@ endif
# to work without, we have to skip it.
ifneq (,$(findstring yes, $(shared_libr)$(allow_nonpic_in_shlib)))
-override CPPFLAGS := -I$(srcdir) -I$(r_includespec) $(CPPFLAGS)
-override CPPFLAGS += -DPKGLIBDIR=\"$(pkglibdir)\" -DDLSUFFIX=\"$(DLSUFFIX)\"
-rpath :=
-
MODULE_big := plr
PG_CPPFLAGS += -I$(r_includespec)
SRCS += plr.c pg_conversion.c pg_backend_support.c pg_userfuncs.c pg_rsupport.c
@@ -46,6 +42,10 @@ EXTRA_CLEAN := doc/HTML.index expected/plr.out
include $(top_srcdir)/contrib/contrib-global.mk
+override CPPFLAGS := -I$(srcdir) -I$(r_includespec) $(CPPFLAGS)
+override CPPFLAGS += -DPKGLIBDIR=\"$(pkglibdir)\" -DDLSUFFIX=\"$(DLSUFFIX)\"
+rpath :=
+
installcheck: plrinstallcheck
plrinstallcheck:
View
8 Makefile.pgxs
@@ -25,10 +25,6 @@ endif
# to work without, we have to skip it.
ifneq (,$(findstring yes, $(shared_libr)$(allow_nonpic_in_shlib)))
-override CPPFLAGS := -I$(srcdir) -I$(r_includespec) $(CPPFLAGS)
-override CPPFLAGS += -DPKGLIBDIR=\"$(pkglibdir)\" -DDLSUFFIX=\"$(DLSUFFIX)\"
-rpath :=
-
MODULE_big := plr
PG_CPPFLAGS += -I$(r_includespec)
SRCS += plr.c pg_conversion.c pg_backend_support.c pg_userfuncs.c pg_rsupport.c
@@ -43,6 +39,10 @@ EXTRA_CLEAN := doc/HTML.index expected/plr.out
PGXS := $(shell pg_config --pgxs)
include $(PGXS)
+override CPPFLAGS := -I$(srcdir) -I$(r_includespec) $(CPPFLAGS)
+override CPPFLAGS += -DPKGLIBDIR=\"$(pkglibdir)\" -DDLSUFFIX=\"$(DLSUFFIX)\"
+rpath :=
+
installcheck: plrinstallcheck
plrinstallcheck:
Please sign in to comment.
Something went wrong with that request. Please try again.