Skip to content

Commit 11f1db1

Browse files
committed
fix make install to stop passing make operators to the shell
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95923 13f79535-47bb-0310-9956-ffa450edef68
1 parent 32e6ad8 commit 11f1db1

1 file changed

Lines changed: 12 additions & 12 deletions

File tree

Makefile.in

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -110,45 +110,45 @@ install-htdocs:
110110
-@if [ -d $(DESTDIR)$(htdocsdir) ]; then \
111111
echo "[PRESERVING EXISTING HTDOCS SUBDIR: $(DESTDIR)$(htdocsdir)]"; \
112112
else \
113-
@echo Installing HTML documents ; \
113+
echo Installing HTML documents ; \
114114
$(MKINSTALLDIRS) $(DESTDIR)$(htdocsdir) ; \
115-
@test -d $(htdocs-srcdir) && (cd $(htdocs-srcdir) && cp -rp * $(DESTDIR)$(htdocsdir)) ; \
115+
test -d $(htdocs-srcdir) && (cd $(htdocs-srcdir) && cp -rp * $(DESTDIR)$(htdocsdir)) ; \
116116
fi
117117
-@if [ -d $(DESTDIR)$(manualdir) ]; then \
118118
echo "[PRESERVING EXISTING MANUAL SUBDIR: $(DESTDIR)$(manualdir)]"; \
119119
else \
120120
$(MKINSTALLDIRS) $(DESTDIR)$(manualdir) ; \
121-
@test -d $(top_srcdir)/docs/manual && (cd $(top_srcdir)/docs/manual && cp -rp * $(DESTDIR)$(manualdir)) ; \
122-
-@test "x$(htdocsdir)" != "x" && cd $(DESTDIR)$(htdocsdir) && find . -name "CVS" -print | xargs rm -rf ; \
121+
test -d $(top_srcdir)/docs/manual && (cd $(top_srcdir)/docs/manual && cp -rp * $(DESTDIR)$(manualdir)) ; \
122+
test "x$(htdocsdir)" != "x" && cd $(DESTDIR)$(htdocsdir) && find . -name "CVS" -print | xargs rm -rf ; \
123123
fi
124124

125125
install-error:
126126
-@if [ -d $(DESTDIR)$(errordir) ]; then \
127127
echo "[PRESERVING EXISTING ERROR SUBDIR: $(DESTDIR)$(errordir)]"; \
128128
else \
129-
@echo Installing error documents ; \
129+
echo Installing error documents ; \
130130
$(MKINSTALLDIRS) $(DESTDIR)$(errordir) ; \
131-
@cd $(top_srcdir)/docs/error && cp -rp * $(DESTDIR)$(errordir) ; \
132-
-@test "x$(errordir)" != "x" && cd $(DESTDIR)$(errordir) && find . -name "CVS" -print | xargs rm -rf ; \
131+
cd $(top_srcdir)/docs/error && cp -rp * $(DESTDIR)$(errordir) ; \
132+
test "x$(errordir)" != "x" && cd $(DESTDIR)$(errordir) && find . -name "CVS" -print | xargs rm -rf ; \
133133
fi
134134

135135
install-icons:
136136
-@if [ -d $(DESTDIR)$(iconsdir) ]; then \
137137
echo "[PRESERVING EXISTING ICONS SUBDIR: $(DESTDIR)$(iconsdir)]"; \
138138
else \
139-
@echo Installing icons ; \
139+
echo Installing icons ; \
140140
$(MKINSTALLDIRS) $(DESTDIR)$(iconsdir) ; \
141-
@cd $(top_srcdir)/docs/icons && cp -rp * $(DESTDIR)$(iconsdir) ; \
142-
-@test "x$(iconsdir)" != "x" && cd $(DESTDIR)$(iconsdir) && find . -name "CVS" -print | xargs rm -rf ; \
141+
cd $(top_srcdir)/docs/icons && cp -rp * $(DESTDIR)$(iconsdir) ; \
142+
test "x$(iconsdir)" != "x" && cd $(DESTDIR)$(iconsdir) && find . -name "CVS" -print | xargs rm -rf ; \
143143
fi
144144

145145
install-cgi:
146146
-@if [ -d $(DESTDIR)$(cgidir) ];then \
147147
echo "[PRESERVING EXISTING CGI SUBDIR: $(DESTDIR)$(cgidir)]"; \
148148
else \
149-
@echo Installing CGIs ; \
149+
echo Installing CGIs ; \
150150
$(MKINSTALLDIRS) $(DESTDIR)$(cgidir) ; \
151-
@cd $(top_srcdir)/docs/cgi-examples && cp -rp * $(DESTDIR)$(cgidir) ; \
151+
cd $(top_srcdir)/docs/cgi-examples && cp -rp * $(DESTDIR)$(cgidir) ; \
152152
test "x$(cgidir)" != "x" && cd $(DESTDIR)$(cgidir) && find . -name "CVS" -print | xargs rm -rf ; \
153153
fi
154154

0 commit comments

Comments
 (0)