diff --git a/src/backend/tsearch/Makefile b/src/backend/tsearch/Makefile index e4643f9199435723c96a411d74351cd183613064..8cb8ae6047aafe8c33292bddc9de957c903f41fa 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 ca96f2dfe10f12aa13b53fb384363bc4ee097e9b..0acd4f0a3cf337eef926d968417b06fc06c5830f 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: