Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit f1c5247

Browse files
committed
Simplify a few makefile rules since install-sh can now install multiple
files in one run.
1 parent 3ceae47 commit f1c5247

File tree

2 files changed

+5
-9
lines changed

2 files changed

+5
-9
lines changed

src/backend/tsearch/Makefile

+3-7
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#
55
# Copyright (c) 2006-2009, PostgreSQL Global Development Group
66
#
7-
# $PostgreSQL: pgsql/src/backend/tsearch/Makefile,v 1.10 2009/08/26 22:24:43 petere Exp $
7+
# $PostgreSQL: pgsql/src/backend/tsearch/Makefile,v 1.11 2009/10/26 21:33:01 petere Exp $
88
#
99
#-------------------------------------------------------------------------
1010
subdir = src/backend/tsearch
@@ -25,15 +25,11 @@ include $(top_srcdir)/src/backend/common.mk
2525

2626
.PHONY: install-data
2727
install-data: $(DICTFILES) installdirs
28-
for i in $(DICTFILES); \
29-
do $(INSTALL_DATA) $(srcdir)/$$i '$(DESTDIR)$(datadir)/$(DICTDIR)/'$$i || exit; \
30-
done
28+
$(INSTALL_DATA) $(addprefix $(srcdir)/,$(DICTFILES)) '$(DESTDIR)$(datadir)/$(DICTDIR)/'
3129

3230
installdirs:
3331
$(MKDIR_P) '$(DESTDIR)$(datadir)' '$(DESTDIR)$(datadir)/$(DICTDIR)'
3432

3533
.PHONY: uninstall-data
3634
uninstall-data:
37-
for i in $(DICTFILES); \
38-
do rm -rf '$(DESTDIR)$(datadir)/$(DICTDIR)/'$$i || exit; \
39-
done
35+
rm -rf $(addprefix '$(DESTDIR)$(datadir)/$(DICTDIR)/',$(DICTFILES))

src/interfaces/ecpg/include/Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ ecpg_headers = ecpgerrno.h ecpglib.h ecpgtype.h sqlca.h sql3types.h ecpg_informi
1818
informix_headers = datetime.h decimal.h sqltypes.h sqlda.h
1919

2020
install-headers: $(ecpg_headers) $(informix_headers)
21-
for i in $(ecpg_headers); do $(INSTALL_DATA) $(srcdir)/$$i '$(DESTDIR)$(includedir)' || exit; done
22-
for i in $(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)/'
2323
$(INSTALL_DATA) $(ecpg_config_h) '$(DESTDIR)$(includedir)'
2424

2525
installdirs:

0 commit comments

Comments
 (0)