Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitf28c54c

Browse files
committed
Fix assorted issues with build and install paths containing spaces.
Apparently there is no buildfarm critter exercising this case after all,because it fails in several places. With this patch, build, install,check-world, and installcheck-world pass for me on OS X.
1 parent64bbf36 commitf28c54c

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

‎src/Makefile.global.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -437,7 +437,7 @@ endif
437437
pg_regress_locale_flags =$(if$(ENCODING),--encoding=$(ENCODING))$(NOLOCALE)
438438

439439
pg_regress_check =$(top_builddir)/src/test/regress/pg_regress --inputdir=$(srcdir) --temp-install=./tmp_check --top-builddir=$(top_builddir)$(pg_regress_locale_flags)
440-
pg_regress_installcheck =$(top_builddir)/src/test/regress/pg_regress --inputdir=$(srcdir) --psqldir=$(PSQLDIR)$(pg_regress_locale_flags)
440+
pg_regress_installcheck =$(top_builddir)/src/test/regress/pg_regress --inputdir=$(srcdir) --psqldir="$(PSQLDIR)"$(pg_regress_locale_flags)
441441

442442
pg_regress_clean_files = results/ regression.diffs regression.out tmp_check/ log/
443443

‎src/Makefile.shlib

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ ifeq ($(PORTNAME), darwin)
130130
ifneq ($(SO_MAJOR_VERSION), 0)
131131
version_link= -compatibility_version $(SO_MAJOR_VERSION) -current_version $(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
132132
endif
133-
LINK.shared= $(COMPILER) -dynamiclib -install_name $(libdir)/lib$(NAME).$(SO_MAJOR_VERSION)$(DLSUFFIX) $(version_link) $(exported_symbols_list) -multiply_defined suppress
133+
LINK.shared= $(COMPILER) -dynamiclib -install_name"$(libdir)/lib$(NAME).$(SO_MAJOR_VERSION)$(DLSUFFIX)" $(version_link) $(exported_symbols_list) -multiply_defined suppress
134134
shlib= lib$(NAME).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)$(DLSUFFIX)
135135
shlib_major= lib$(NAME).$(SO_MAJOR_VERSION)$(DLSUFFIX)
136136
else

‎src/interfaces/ecpg/test/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,4 +84,4 @@ checktcp: all
8484
./pg_regress --dbname=regress1,connectdb --top-builddir=$(top_builddir) --temp-install=./tmp_check$(pg_regress_locale_flags)$(THREAD) --schedule=$(srcdir)/ecpg_schedule_tcp --create-role=connectuser,connectdb --host=localhost
8585

8686
installcheck: all
87-
./pg_regress --psqldir=$(PSQLDIR) --dbname=regress1,connectdb --top-builddir=$(top_builddir)$(pg_regress_locale_flags)$(THREAD) --schedule=$(srcdir)/ecpg_schedule --create-role=connectuser,connectdb
87+
./pg_regress --psqldir="$(PSQLDIR)" --dbname=regress1,connectdb --top-builddir=$(top_builddir)$(pg_regress_locale_flags)$(THREAD) --schedule=$(srcdir)/ecpg_schedule --create-role=connectuser,connectdb

‎src/test/isolation/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ maintainer-clean: distclean
7373
rm -f specparse.c specscanner.c
7474

7575
installcheck: all
76-
./pg_isolation_regress --psqldir=$(PSQLDIR) --inputdir=$(srcdir) --schedule=$(srcdir)/isolation_schedule
76+
./pg_isolation_regress --psqldir="$(PSQLDIR)" --inputdir=$(srcdir) --schedule=$(srcdir)/isolation_schedule
7777

7878
# We can't support "make check" because isolationtester requires libpq, and
7979
# in fact (on typical platforms using shared libraries) requires libpq to

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp