diff options
| author | Peter Eisentraut <peter_e@gmx.net> | 2009-10-26 21:33:01 +0000 |
|---|---|---|
| committer | Peter Eisentraut <peter_e@gmx.net> | 2009-10-26 21:33:01 +0000 |
| commit | f1c5247563020acf45bbf828cce681cd1f1b1ef2 (patch) | |
| tree | 826bd61c52609407428856ba6d4a49449494168b /src | |
| parent | 3ceae4795b1ae6414b7a04c60ace049737cdb3d6 (diff) | |
| download | postgresql-f1c5247563020acf45bbf828cce681cd1f1b1ef2.tar.gz postgresql-f1c5247563020acf45bbf828cce681cd1f1b1ef2.zip | |
Simplify a few makefile rules since install-sh can now install multiple
files in one run.
Diffstat (limited to 'src')
| -rw-r--r-- | src/backend/tsearch/Makefile | 10 | ||||
| -rw-r--r-- | src/interfaces/ecpg/include/Makefile | 4 |
2 files changed, 5 insertions, 9 deletions
diff --git a/src/backend/tsearch/Makefile b/src/backend/tsearch/Makefile index e4643f91994..8cb8ae6047a 100644 --- a/src/backend/tsearch/Makefile +++ b/src/backend/tsearch/Makefile @@ -4,7 +4,7 @@ # # Copyright (c) 2006-2009, PostgreSQL Global Development Group # -# $PostgreSQL: pgsql/src/backend/tsearch/Makefile,v 1.10 2009/08/26 22:24:43 petere Exp $ +# $PostgreSQL: pgsql/src/backend/tsearch/Makefile,v 1.11 2009/10/26 21:33:01 petere Exp $ # #------------------------------------------------------------------------- subdir = src/backend/tsearch @@ -25,15 +25,11 @@ include $(top_srcdir)/src/backend/common.mk .PHONY: install-data install-data: $(DICTFILES) installdirs - for i in $(DICTFILES); \ - do $(INSTALL_DATA) $(srcdir)/$$i '$(DESTDIR)$(datadir)/$(DICTDIR)/'$$i || exit; \ - done + $(INSTALL_DATA) $(addprefix $(srcdir)/,$(DICTFILES)) '$(DESTDIR)$(datadir)/$(DICTDIR)/' installdirs: $(MKDIR_P) '$(DESTDIR)$(datadir)' '$(DESTDIR)$(datadir)/$(DICTDIR)' .PHONY: uninstall-data uninstall-data: - for i in $(DICTFILES); \ - do rm -rf '$(DESTDIR)$(datadir)/$(DICTDIR)/'$$i || exit; \ - done + rm -rf $(addprefix '$(DESTDIR)$(datadir)/$(DICTDIR)/',$(DICTFILES)) diff --git a/src/interfaces/ecpg/include/Makefile b/src/interfaces/ecpg/include/Makefile index ca96f2dfe10..0acd4f0a3cf 100644 --- a/src/interfaces/ecpg/include/Makefile +++ b/src/interfaces/ecpg/include/Makefile @@ -18,8 +18,8 @@ ecpg_headers = ecpgerrno.h ecpglib.h ecpgtype.h sqlca.h sql3types.h ecpg_informi informix_headers = datetime.h decimal.h sqltypes.h sqlda.h install-headers: $(ecpg_headers) $(informix_headers) - for i in $(ecpg_headers); do $(INSTALL_DATA) $(srcdir)/$$i '$(DESTDIR)$(includedir)' || exit; done - for i in $(informix_headers); do $(INSTALL_DATA) $(srcdir)/$$i '$(DESTDIR)$(informix_esql_dir)' || exit; done + $(INSTALL_DATA) $(addprefix $(srcdir)/,$(ecpg_headers)) '$(DESTDIR)$(includedir)/' + $(INSTALL_DATA) $(addprefix $(srcdir)/,$(informix_headers)) '$(DESTDIR)$(informix_esql_dir)/' $(INSTALL_DATA) $(ecpg_config_h) '$(DESTDIR)$(includedir)' installdirs: |