diff options
| author | Peter Eisentraut <peter_e@gmx.net> | 2010-05-13 11:49:48 +0000 |
|---|---|---|
| committer | Peter Eisentraut <peter_e@gmx.net> | 2010-05-13 11:49:48 +0000 |
| commit | 3393551d541ce949e20725dca6366a97b142ef5d (patch) | |
| tree | 2a022e11ce70f1f6aeb0a7c0fc16c0970473b528 | |
| parent | 463f151a23242c531890589db3692077aadb05ca (diff) | |
| download | postgresql-3393551d541ce949e20725dca6366a97b142ef5d.tar.gz postgresql-3393551d541ce949e20725dca6366a97b142ef5d.zip | |
Fix vpath installation from distribution tarball (bug #5447)
| -rw-r--r-- | doc/src/sgml/Makefile | 4 | ||||
| -rw-r--r-- | src/Makefile.global.in | 4 | ||||
| -rw-r--r-- | src/backend/catalog/Makefile | 8 |
3 files changed, 8 insertions, 8 deletions
diff --git a/doc/src/sgml/Makefile b/doc/src/sgml/Makefile index 188afc13a0d..52a33905120 100644 --- a/doc/src/sgml/Makefile +++ b/doc/src/sgml/Makefile @@ -2,7 +2,7 @@ # # PostgreSQL documentation makefile # -# $PostgreSQL: pgsql/doc/src/sgml/Makefile,v 1.142 2010/05/01 21:31:17 tgl Exp $ +# $PostgreSQL: pgsql/doc/src/sgml/Makefile,v 1.143 2010/05/13 11:49:47 petere Exp $ # #---------------------------------------------------------------------------- @@ -277,8 +277,6 @@ check: postgres.sgml $(ALMOSTALLSGML) check-tabs ## Install ## -vpathsearch = `for f in $(addsuffix /$(1),$(subst :, ,. $(VPATH))); do test -r $$f && echo $$f && break; done` - install: install-html ifneq ($(PORTNAME), sco) diff --git a/src/Makefile.global.in b/src/Makefile.global.in index c5b675cb63d..bfbcf8851cd 100644 --- a/src/Makefile.global.in +++ b/src/Makefile.global.in @@ -1,5 +1,5 @@ # -*-makefile-*- -# $PostgreSQL: pgsql/src/Makefile.global.in,v 1.261 2010/03/24 13:14:02 adunstan Exp $ +# $PostgreSQL: pgsql/src/Makefile.global.in,v 1.262 2010/05/13 11:49:47 petere Exp $ #------------------------------------------------------------------------------ # All PostgreSQL makefiles include this file and use the variables it sets, @@ -44,6 +44,8 @@ srcdir = $(top_srcdir)/$(subdir) VPATH = $(srcdir) endif +vpathsearch = `for f in $(addsuffix /$(1),$(subst :, ,. $(VPATH))); do test -r $$f && echo $$f && break; done` + # Saved arguments from configure configure_args = @configure_args@ diff --git a/src/backend/catalog/Makefile b/src/backend/catalog/Makefile index a73971d1627..a97003943ed 100644 --- a/src/backend/catalog/Makefile +++ b/src/backend/catalog/Makefile @@ -2,7 +2,7 @@ # # Makefile for backend/catalog # -# $PostgreSQL: pgsql/src/backend/catalog/Makefile,v 1.77 2010/02/16 22:34:43 tgl Exp $ +# $PostgreSQL: pgsql/src/backend/catalog/Makefile,v 1.78 2010/05/13 11:49:48 petere Exp $ # #------------------------------------------------------------------------- @@ -59,9 +59,9 @@ postgres.bki: genbki.pl Catalog.pm $(POSTGRES_BKI_SRCS) .PHONY: install-data install-data: $(BKIFILES) installdirs - $(INSTALL_DATA) postgres.bki '$(DESTDIR)$(datadir)/postgres.bki' - $(INSTALL_DATA) postgres.description '$(DESTDIR)$(datadir)/postgres.description' - $(INSTALL_DATA) postgres.shdescription '$(DESTDIR)$(datadir)/postgres.shdescription' + $(INSTALL_DATA) $(call vpathsearch,postgres.bki) '$(DESTDIR)$(datadir)/postgres.bki' + $(INSTALL_DATA) $(call vpathsearch,postgres.description) '$(DESTDIR)$(datadir)/postgres.description' + $(INSTALL_DATA) $(call vpathsearch,postgres.shdescription) '$(DESTDIR)$(datadir)/postgres.shdescription' $(INSTALL_DATA) $(srcdir)/system_views.sql '$(DESTDIR)$(datadir)/system_views.sql' $(INSTALL_DATA) $(srcdir)/information_schema.sql '$(DESTDIR)$(datadir)/information_schema.sql' $(INSTALL_DATA) $(srcdir)/sql_features.txt '$(DESTDIR)$(datadir)/sql_features.txt' |