diff options
| -rw-r--r-- | src/Makefile.shlib | 2 | ||||
| -rw-r--r-- | src/interfaces/ecpg/test/Makefile | 2 | ||||
| -rw-r--r-- | src/makefiles/pgxs.mk | 2 | ||||
| -rw-r--r-- | src/pl/plperl/GNUmakefile | 2 | ||||
| -rw-r--r-- | src/pl/plpython/Makefile | 4 | ||||
| -rw-r--r-- | src/pl/tcl/Makefile | 2 | ||||
| -rw-r--r-- | src/test/regress/GNUmakefile | 8 |
7 files changed, 11 insertions, 11 deletions
diff --git a/src/Makefile.shlib b/src/Makefile.shlib index f3dc2409b93..a01d10be042 100644 --- a/src/Makefile.shlib +++ b/src/Makefile.shlib @@ -129,7 +129,7 @@ ifeq ($(PORTNAME), darwin) ifneq ($(SO_MAJOR_VERSION), 0) version_link = -compatibility_version $(SO_MAJOR_VERSION) -current_version $(SO_MAJOR_VERSION).$(SO_MINOR_VERSION) endif - LINK.shared = $(COMPILER) -dynamiclib -install_name $(libdir)/lib$(NAME).$(SO_MAJOR_VERSION)$(DLSUFFIX) $(version_link) $(exported_symbols_list) -multiply_defined suppress + LINK.shared = $(COMPILER) -dynamiclib -install_name "$(libdir)/lib$(NAME).$(SO_MAJOR_VERSION)$(DLSUFFIX)" $(version_link) $(exported_symbols_list) -multiply_defined suppress shlib = lib$(NAME).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)$(DLSUFFIX) shlib_major = lib$(NAME).$(SO_MAJOR_VERSION)$(DLSUFFIX) else diff --git a/src/interfaces/ecpg/test/Makefile b/src/interfaces/ecpg/test/Makefile index 0e015bb5a6f..cf6ccb81ddf 100644 --- a/src/interfaces/ecpg/test/Makefile +++ b/src/interfaces/ecpg/test/Makefile @@ -90,4 +90,4 @@ checktcp: all ./pg_regress --dbname=regress1,connectdb --top-builddir=$(top_builddir) --temp-install=./tmp_check --multibyte=$(MULTIBYTE) $(NOLOCALE) $(THREAD) --schedule=$(srcdir)/ecpg_schedule_tcp --create-role=connectuser,connectdb --host=localhost installcheck: all - ./pg_regress --psqldir=$(PSQLDIR) --dbname=regress1,connectdb --top-builddir=$(top_builddir) --multibyte=$(MULTIBYTE) $(NOLOCALE) $(THREAD) --schedule=$(srcdir)/ecpg_schedule --create-role=connectuser,connectdb + ./pg_regress --psqldir="$(PSQLDIR)" --dbname=regress1,connectdb --top-builddir=$(top_builddir) --multibyte=$(MULTIBYTE) $(NOLOCALE) $(THREAD) --schedule=$(srcdir)/ecpg_schedule --create-role=connectuser,connectdb diff --git a/src/makefiles/pgxs.mk b/src/makefiles/pgxs.mk index a9cc7cabc49..4f1ae191012 100644 --- a/src/makefiles/pgxs.mk +++ b/src/makefiles/pgxs.mk @@ -264,7 +264,7 @@ endif # against installed postmaster installcheck: submake - $(top_builddir)/src/test/regress/pg_regress --inputdir=$(srcdir) --psqldir=$(PSQLDIR) $(REGRESS_OPTS) $(REGRESS) + $(top_builddir)/src/test/regress/pg_regress --inputdir=$(srcdir) --psqldir="$(PSQLDIR)" $(REGRESS_OPTS) $(REGRESS) # in-tree test doesn't work yet (no way to install my shared library) #check: all submake diff --git a/src/pl/plperl/GNUmakefile b/src/pl/plperl/GNUmakefile index 6bbd1bfb239..d53811263a4 100644 --- a/src/pl/plperl/GNUmakefile +++ b/src/pl/plperl/GNUmakefile @@ -77,7 +77,7 @@ installdirs: installdirs-lib uninstall: uninstall-lib installcheck: submake - $(top_builddir)/src/test/regress/pg_regress --inputdir=$(srcdir) --psqldir=$(PSQLDIR) $(REGRESS_OPTS) $(REGRESS) + $(top_builddir)/src/test/regress/pg_regress --inputdir=$(srcdir) --psqldir="$(PSQLDIR)" $(REGRESS_OPTS) $(REGRESS) .PHONY: submake submake: diff --git a/src/pl/plpython/Makefile b/src/pl/plpython/Makefile index 4b18076a0f4..5abe2e0ff33 100644 --- a/src/pl/plpython/Makefile +++ b/src/pl/plpython/Makefile @@ -121,12 +121,12 @@ clean3: rm -rf python3/ installcheck: submake prep3 - $(top_builddir)/src/test/regress/pg_regress --inputdir=./python3 --outputdir=./python3 --psqldir=$(PSQLDIR) $(REGRESS_OPTS) $(REGRESS) + $(top_builddir)/src/test/regress/pg_regress --inputdir=./python3 --outputdir=./python3 --psqldir="$(PSQLDIR)" $(REGRESS_OPTS) $(REGRESS) clean: clean3 else installcheck: submake - $(top_builddir)/src/test/regress/pg_regress --inputdir=$(srcdir) --psqldir=$(PSQLDIR) $(REGRESS_OPTS) $(REGRESS) + $(top_builddir)/src/test/regress/pg_regress --inputdir=$(srcdir) --psqldir="$(PSQLDIR)" $(REGRESS_OPTS) $(REGRESS) endif .PHONY: submake diff --git a/src/pl/tcl/Makefile b/src/pl/tcl/Makefile index 1b71c7c2319..5d82e5fb5fa 100644 --- a/src/pl/tcl/Makefile +++ b/src/pl/tcl/Makefile @@ -59,7 +59,7 @@ uninstall: uninstall-lib $(MAKE) -C modules $@ installcheck: submake - $(top_builddir)/src/test/regress/pg_regress --inputdir=$(srcdir) --psqldir=$(PSQLDIR) $(REGRESS_OPTS) $(REGRESS) + $(top_builddir)/src/test/regress/pg_regress --inputdir=$(srcdir) --psqldir="$(PSQLDIR)" $(REGRESS_OPTS) $(REGRESS) .PHONY: submake submake: diff --git a/src/test/regress/GNUmakefile b/src/test/regress/GNUmakefile index 5f8f04f19c2..31762b85930 100644 --- a/src/test/regress/GNUmakefile +++ b/src/test/regress/GNUmakefile @@ -144,13 +144,13 @@ check: all $(pg_regress_call) --temp-install=./tmp_check --top-builddir=$(top_builddir) --schedule=$(srcdir)/parallel_schedule $(MAXCONNOPT) $(TEMP_CONF) installcheck: all - $(pg_regress_call) --psqldir=$(PSQLDIR) --schedule=$(srcdir)/serial_schedule + $(pg_regress_call) --psqldir="$(PSQLDIR)" --schedule=$(srcdir)/serial_schedule installcheck-parallel: all - $(pg_regress_call) --psqldir=$(PSQLDIR) --schedule=$(srcdir)/parallel_schedule $(MAXCONNOPT) + $(pg_regress_call) --psqldir="$(PSQLDIR)" --schedule=$(srcdir)/parallel_schedule $(MAXCONNOPT) standbycheck: all - $(pg_regress_call) --psqldir=$(PSQLDIR) --schedule=$(srcdir)/standby_schedule --use-existing + $(pg_regress_call) --psqldir="$(PSQLDIR)" --schedule=$(srcdir)/standby_schedule --use-existing # old interfaces follow... @@ -159,7 +159,7 @@ runtest: installcheck runtest-parallel: installcheck-parallel bigtest: all - $(pg_regress_call) --psqldir=$(PSQLDIR) --schedule=$(srcdir)/serial_schedule numeric_big + $(pg_regress_call) --psqldir="$(PSQLDIR)" --schedule=$(srcdir)/serial_schedule numeric_big bigcheck: all $(pg_regress_call) --temp-install=./tmp_check --top-builddir=$(top_builddir) --schedule=$(srcdir)/parallel_schedule $(MAXCONNOPT) numeric_big |