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

Commit59d30d9

Browse files
committed
Revert "Backpatch pgxs vpath build and installation fixes."
This reverts commitcd453fe.
1 parentcd453fe commit59d30d9

File tree

2 files changed

+19
-49
lines changed

2 files changed

+19
-49
lines changed

‎src/Makefile.global.in

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -415,22 +415,12 @@ else
415415
libpq_pgport = -L$(top_builddir)/src/port -lpgport$(libpq)
416416
endif
417417

418-
# If PGXS is not defined, build libpq and libpgport dependancies as required.
419-
# If the build is with PGXS, then these are supposed to be already built and
420-
# installed, and we just ensure that the expected files exist.
421-
ifndefPGXS
418+
422419
submake-libpq:
423420
$(MAKE) -C$(libpq_builddir) all
424-
else
425-
submake-libpq:$(libdir)/libpq.so ;
426-
endif
427421

428-
ifndefPGXS
429422
submake-libpgport:
430423
$(MAKE) -C$(top_builddir)/src/port all
431-
else
432-
submake-libpgport:$(libdir)/libpgport.a
433-
endif
434424

435425
.PHONY: submake-libpq submake-libpgport
436426

‎src/makefiles/pgxs.mk

Lines changed: 18 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -62,20 +62,8 @@ top_builddir := $(dir $(PGXS))../..
6262
include$(top_builddir)/src/Makefile.global
6363

6464
top_srcdir =$(top_builddir)
65-
# If USE_VPATH is set or Makefile is not in current directory we are building
66-
# the extension with VPATH so we set the variable here
67-
ifdefUSE_VPATH
68-
srcdir =$(USE_VPATH)
69-
VPATH =$(USE_VPATH)
70-
else
71-
ifeq ($(CURDIR),$(dir$(firstword$(MAKEFILE_LIST))))
7265
srcdir = .
7366
VPATH =
74-
else
75-
srcdir =$(dir$(firstword$(MAKEFILE_LIST)))
76-
VPATH =$(srcdir)
77-
endif
78-
endif
7967

8068
# These might be set in Makefile.global, but if they were not found
8169
# during the build of PostgreSQL, supply default values so that users
@@ -124,40 +112,33 @@ all: all-lib
124112
endif# MODULE_big
125113

126114

127-
install: all installcontrol installdata installdatatsearch installdocs installscripts | installdirs
128-
ifdefMODULES
129-
$(INSTALL_SHLIB) $(addsuffix $(DLSUFFIX), $(MODULES)) '$(DESTDIR)$(pkglibdir)/'
130-
endif# MODULES
131-
ifdefPROGRAM
132-
$(INSTALL_PROGRAM) $(PROGRAM)$(X) '$(DESTDIR)$(bindir)'
133-
endif# PROGRAM
134-
135-
installcontrol:$(addsuffix .control,$(EXTENSION))
115+
install: all installdirs
136116
ifneq (,$(EXTENSION))
137-
$(INSTALL_DATA) $^ '$(DESTDIR)$(datadir)/extension/'
138-
endif
139-
140-
installdata:$(DATA)$(DATA_built)
117+
$(INSTALL_DATA) $(addprefix $(srcdir)/, $(addsuffix .control, $(EXTENSION))) '$(DESTDIR)$(datadir)/extension/'
118+
endif# EXTENSION
141119
ifneq (,$(DATA)$(DATA_built))
142-
$(INSTALL_DATA) $^ '$(DESTDIR)$(datadir)/$(datamoduledir)/'
143-
endif
144-
145-
installdatatsearch:$(DATA_TSEARCH)
120+
$(INSTALL_DATA) $(addprefix $(srcdir)/, $(DATA)) $(DATA_built) '$(DESTDIR)$(datadir)/$(datamoduledir)/'
121+
endif# DATA
146122
ifneq (,$(DATA_TSEARCH))
147-
$(INSTALL_DATA) $^ '$(DESTDIR)$(datadir)/tsearch_data/'
148-
endif
149-
150-
installdocs:$(DOCS)
123+
$(INSTALL_DATA) $(addprefix $(srcdir)/, $(DATA_TSEARCH)) '$(DESTDIR)$(datadir)/tsearch_data/'
124+
endif# DATA_TSEARCH
125+
ifdefMODULES
126+
$(INSTALL_SHLIB) $(addsuffix $(DLSUFFIX), $(MODULES)) '$(DESTDIR)$(pkglibdir)/'
127+
endif# MODULES
151128
ifdefDOCS
152129
ifdefdocdir
153-
$(INSTALL_DATA) $^ '$(DESTDIR)$(docdir)/$(docmoduledir)/'
130+
$(INSTALL_DATA) $(addprefix $(srcdir)/, $(DOCS)) '$(DESTDIR)$(docdir)/$(docmoduledir)/'
154131
endif# docdir
155132
endif# DOCS
156-
157-
installscripts:$(SCRIPTS)$(SCRIPTS_built)
133+
ifdefPROGRAM
134+
$(INSTALL_PROGRAM) $(PROGRAM)$(X) '$(DESTDIR)$(bindir)'
135+
endif# PROGRAM
158136
ifdefSCRIPTS
159-
$(INSTALL_SCRIPT) $^ '$(DESTDIR)$(bindir)/'
137+
$(INSTALL_SCRIPT) $(addprefix $(srcdir)/, $(SCRIPTS)) '$(DESTDIR)$(bindir)/'
160138
endif# SCRIPTS
139+
ifdefSCRIPTS_built
140+
$(INSTALL_SCRIPT) $(SCRIPTS_built) '$(DESTDIR)$(bindir)/'
141+
endif# SCRIPTS_built
161142

162143
ifdefMODULE_big
163144
install: install-lib
@@ -282,7 +263,6 @@ test_files_build := $(patsubst $(srcdir)/%, $(abs_builddir)/%, $(test_files_src)
282263

283264
all:$(test_files_build)
284265
$(test_files_build):$(abs_builddir)/%:$(srcdir)/%
285-
$(MKDIR_P)$(dir$@)
286266
ln -s$<$@
287267
endif# VPATH
288268

0 commit comments

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