Commit3393551

committed

Fix vpath installation from distribution tarball (bug #5447)

1 parent463f151 commit3393551Copy full SHA for 3393551

File tree

-8

lines changed

-8

lines changed

Lines changed: 1 addition & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`#`
`3`	`3`	`# PostgreSQL documentation makefile`
`4`	`4`	`#`
`5`		`-# $PostgreSQL: pgsql/doc/src/sgml/Makefile,v 1.142 2010/05/01 21:31:17 tgl Exp $`
	`5`	`+# $PostgreSQL: pgsql/doc/src/sgml/Makefile,v 1.143 2010/05/13 11:49:47 petere Exp $`
`6`	`6`	`#`
`7`	`7`	`#----------------------------------------------------------------------------`
`8`	`8`
`@@ -277,8 +277,6 @@ check: postgres.sgml $(ALMOSTALLSGML) check-tabs`
`277`	`277`	`## Install`
`278`	`278`	`##`
`279`	`279`
`280`		-vpathsearch =`for fin$(addsuffix /$(1),$(subst :, ,.$(VPATH)));dotest -r$$f&&echo$$f&&break; done`
`281`		`-`
`282`	`280`	`install: install-html`
`283`	`281`
`284`	`282`	`ifneq ($(PORTNAME), sco)`

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`# --makefile--`
`2`		`-# $PostgreSQL: pgsql/src/Makefile.global.in,v 1.261 2010/03/24 13:14:02 adunstan Exp $`
	`2`	`+# $PostgreSQL: pgsql/src/Makefile.global.in,v 1.262 2010/05/13 11:49:47 petere Exp $`
`3`	`3`
`4`	`4`	`#------------------------------------------------------------------------------`
`5`	`5`	`# All PostgreSQL makefiles include this file and use the variables it sets,`
`@@ -44,6 +44,8 @@ srcdir = $(top_srcdir)/$(subdir)`
`44`	`44`	`VPATH =$(srcdir)`
`45`	`45`	`endif`
`46`	`46`
	`47`	+vpathsearch =`for fin$(addsuffix /$(1),$(subst :, ,.$(VPATH)));dotest -r$$f&&echo$$f&&break; done`
	`48`	`+`
`47`	`49`	`# Saved arguments from configure`
`48`	`50`	`configure_args = @configure_args@`
`49`	`51`

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`#`
`3`	`3`	`# Makefile for backend/catalog`
`4`	`4`	`#`
`5`		`-# $PostgreSQL: pgsql/src/backend/catalog/Makefile,v 1.77 2010/02/16 22:34:43 tgl Exp $`
	`5`	`+# $PostgreSQL: pgsql/src/backend/catalog/Makefile,v 1.78 2010/05/13 11:49:48 petere Exp $`
`6`	`6`	`#`
`7`	`7`	`#-------------------------------------------------------------------------`
`8`	`8`
`@@ -59,9 +59,9 @@ postgres.bki: genbki.pl Catalog.pm $(POSTGRES_BKI_SRCS)`
`59`	`59`
`60`	`60`	`.PHONY: install-data`
`61`	`61`	`install-data:$(BKIFILES) installdirs`
`62`		`-$(INSTALL_DATA) postgres.bki'$(DESTDIR)$(datadir)/postgres.bki'`
`63`		`-$(INSTALL_DATA) postgres.description'$(DESTDIR)$(datadir)/postgres.description'`
`64`		`-$(INSTALL_DATA) postgres.shdescription'$(DESTDIR)$(datadir)/postgres.shdescription'`
	`62`	`+$(INSTALL_DATA)$(call vpathsearch,postgres.bki)'$(DESTDIR)$(datadir)/postgres.bki'`
	`63`	`+$(INSTALL_DATA)$(call vpathsearch,postgres.description)'$(DESTDIR)$(datadir)/postgres.description'`
	`64`	`+$(INSTALL_DATA)$(call vpathsearch,postgres.shdescription)'$(DESTDIR)$(datadir)/postgres.shdescription'`
`65`	`65`	`$(INSTALL_DATA)$(srcdir)/system_views.sql'$(DESTDIR)$(datadir)/system_views.sql'`
`66`	`66`	`$(INSTALL_DATA)$(srcdir)/information_schema.sql'$(DESTDIR)$(datadir)/information_schema.sql'`
`67`	`67`	`$(INSTALL_DATA)$(srcdir)/sql_features.txt'$(DESTDIR)$(datadir)/sql_features.txt'`

Comments

(0)