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

Commit54fac0e

Browse files
committed
Remove make function vpathsearch
This function served to support having prebuilt files in the sourcetree for vpath builds. This is no longer possible (since721856f); all built files are now always in the build tree. Theinvocations of this function are no longer required.
1 parenta9a47fb commit54fac0e

File tree

3 files changed

+7
-9
lines changed

3 files changed

+7
-9
lines changed

‎doc/src/sgml/Makefile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ uninstall:
215215
## Install html
216216

217217
install-html: html installdirs
218-
cp -R$(call vpathsearch,html)'$(DESTDIR)$(htmldir)'
218+
cp -R html'$(DESTDIR)$(htmldir)'
219219

220220

221221
## Install man
@@ -230,7 +230,7 @@ sqlmansectnum = $(shell expr X'$(sqlmansect)' : X'\([0-9]\)')
230230
#
231231
ifeq ($(sqlmansectnum),7)
232232
install-man:
233-
cp -R$(foreach dir,man1 man3 man7,$(call vpathsearch,$(dir)))'$(DESTDIR)$(mandir)'
233+
cp -R man1 man3 man7'$(DESTDIR)$(mandir)'
234234

235235
else # sqlmansectnum != 7
236236
fix_sqlmansectnum = sed -e '/^\.TH/s/"7"/"$(sqlmansect)"/'\
@@ -241,9 +241,9 @@ man: fixed-man-stamp
241241

242242
fixed-man-stamp: man-stamp
243243
@$(MKDIR_P)$(addprefix fixedman/,man1 man3 man$(sqlmansectnum))
244-
forfilein$(call vpathsearch,man1)/*.1;do$(fix_sqlmansectnum)$$file>fixedman/man1/`basename$$file`||exit;done
245-
forfilein$(call vpathsearch,man3)/*.3;do$(fix_sqlmansectnum)$$file>fixedman/man3/`basename$$file`||exit;done
246-
forfilein$(call vpathsearch,man7)/*.7;do$(fix_sqlmansectnum)$$file>fixedman/man$(sqlmansectnum)/`basename$$file| sed s/\.7$$/.$(sqlmansect)/`||exit;done
244+
forfilein man1/*.1;do$(fix_sqlmansectnum)$$file>fixedman/man1/`basename$$file`||exit;done
245+
forfilein man3/*.3;do$(fix_sqlmansectnum)$$file>fixedman/man3/`basename$$file`||exit;done
246+
forfilein man7/*.7;do$(fix_sqlmansectnum)$$file>fixedman/man$(sqlmansectnum)/`basename$$file| sed s/\.7$$/.$(sqlmansect)/`||exit;done
247247

248248
install-man:
249249
cp -R$(foreach dir,man1 man3 man$(sqlmansectnum),fixedman/$(dir))'$(DESTDIR)$(mandir)'

‎src/Makefile.global.in

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,6 @@ VPATH = $(srcdir)
7676
endif
7777
endif# not PGXS
7878

79-
vpathsearch =`for fin$(addsuffix /$(1),$(subst :, ,.$(VPATH)));dotest -r$$f&&echo$$f&&break; done`
80-
8179

8280
##########################################################################
8381
#

‎src/backend/catalog/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -183,8 +183,8 @@ $(top_builddir)/src/include/catalog/header-stamp: bki-stamp
183183
# Note: installation of generated headers is handled elsewhere
184184
.PHONY: install-data
185185
install-data: bki-stamp installdirs
186-
$(INSTALL_DATA)$(call vpathsearch,postgres.bki)'$(DESTDIR)$(datadir)/postgres.bki'
187-
$(INSTALL_DATA)$(call vpathsearch,system_constraints.sql)'$(DESTDIR)$(datadir)/system_constraints.sql'
186+
$(INSTALL_DATA) postgres.bki'$(DESTDIR)$(datadir)/postgres.bki'
187+
$(INSTALL_DATA) system_constraints.sql'$(DESTDIR)$(datadir)/system_constraints.sql'
188188
$(INSTALL_DATA)$(srcdir)/system_functions.sql'$(DESTDIR)$(datadir)/system_functions.sql'
189189
$(INSTALL_DATA)$(srcdir)/system_views.sql'$(DESTDIR)$(datadir)/system_views.sql'
190190
$(INSTALL_DATA)$(srcdir)/information_schema.sql'$(DESTDIR)$(datadir)/information_schema.sql'

0 commit comments

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