Commitf1c5247

committed

Simplify a few makefile rules since install-sh can now install multiple

files in one run.

1 parent3ceae47 commitf1c5247Copy full SHA for f1c5247

File tree

-9

lines changed

-9

lines changed

Lines changed: 3 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`#`
`5`	`5`	`# Copyright (c) 2006-2009, PostgreSQL Global Development Group`
`6`	`6`	`#`
`7`		`-# $PostgreSQL: pgsql/src/backend/tsearch/Makefile,v 1.10 2009/08/2622:24:43 petere Exp $`
	`7`	`+# $PostgreSQL: pgsql/src/backend/tsearch/Makefile,v 1.11 2009/10/2621:33:01 petere Exp $`
`8`	`8`	`#`
`9`	`9`	`#-------------------------------------------------------------------------`
`10`	`10`	`subdir = src/backend/tsearch`
`@@ -25,15 +25,11 @@ include $(top_srcdir)/src/backend/common.mk`
`25`	`25`
`26`	`26`	`.PHONY: install-data`
`27`	`27`	`install-data:$(DICTFILES) installdirs`
`28`		`-foriin$(DICTFILES); \`
`29`		`-do$(INSTALL_DATA)$(srcdir)/$$i'$(DESTDIR)$(datadir)/$(DICTDIR)/'$$i\|\|exit;\`
`30`		`-done`
	`28`	`+$(INSTALL_DATA)$(addprefix$(srcdir)/,$(DICTFILES))'$(DESTDIR)$(datadir)/$(DICTDIR)/'`
`31`	`29`
`32`	`30`	`installdirs:`
`33`	`31`	`$(MKDIR_P)'$(DESTDIR)$(datadir)''$(DESTDIR)$(datadir)/$(DICTDIR)'`
`34`	`32`
`35`	`33`	`.PHONY: uninstall-data`
`36`	`34`	`uninstall-data:`
`37`		`-foriin$(DICTFILES); \`
`38`		`-do rm -rf'$(DESTDIR)$(datadir)/$(DICTDIR)/'$$i\|\|exit;\`
`39`		`-done`
	`35`	`+rm -rf$(addprefix '$(DESTDIR)$(datadir)/$(DICTDIR)/',$(DICTFILES))`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -18,8 +18,8 @@ ecpg_headers = ecpgerrno.h ecpglib.h ecpgtype.h sqlca.h sql3types.h ecpg_informi`
`18`	`18`	`informix_headers = datetime.h decimal.h sqltypes.h sqlda.h`
`19`	`19`
`20`	`20`	`install-headers:$(ecpg_headers)$(informix_headers)`
`21`		`-foriin$(ecpg_headers);do$(INSTALL_DATA)$(srcdir)/$$i'$(DESTDIR)$(includedir)'\|\|exit;done`
`22`		`-foriin$(informix_headers);do$(INSTALL_DATA)$(srcdir)/$$i'$(DESTDIR)$(informix_esql_dir)'\|\|exit;done`
	`21`	`+$(INSTALL_DATA)$(addprefix$(srcdir)/,$(ecpg_headers))'$(DESTDIR)$(includedir)/'`
	`22`	`+$(INSTALL_DATA)$(addprefix$(srcdir)/,$(informix_headers))'$(DESTDIR)$(informix_esql_dir)/'`
`23`	`23`	`$(INSTALL_DATA)$(ecpg_config_h)'$(DESTDIR)$(includedir)'`
`24`	`24`
`25`	`25`	`installdirs:`

Comments

(0)