From: Sascha Schumann <sascha@apache.org>
Date: Sun, 30 Apr 2000 22:30:23 +0000 (+0000)
Subject: Make install target work on AIX.
X-Git-Tag: APACHE_2_0_ALPHA_4~212
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f8e8de348f871def0cfe356cc6495fdf43480d92;p=thirdparty%2Fapache%2Fhttpd.git

Make install target work on AIX.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85116 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/Makefile.in b/Makefile.in
index 759e0f81f56..d1c7cb2f6f8 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -48,27 +48,27 @@ install-conf:
 install-htdocs:
 	@echo Installing HTML documents
 	@test -d $(htdocsdir) || $(mkinstalldirs) $(htdocsdir)
-	@cp -rp $(srcdir)/../htdocs/* $(htdocsdir)
+	@(cd $(srcdir)/../htdocs && cp -rp * $(htdocsdir))
 
 install-icons:
 	@echo Installing icons
 	@test -d $(iconsdir) || $(mkinstalldirs) $(iconsdir)
-	@cp -rp $(srcdir)/../icons/* $(iconsdir)
+	@(cd $(srcdir)/../icons && cp -rp * $(iconsdir))
 
 install-cgi:
 	@echo Installing CGIs
 	@test -d $(cgidir) || $(mkinstalldirs) $(cgidir)
-	@cp -rp $(srcdir)/../cgi-bin/* $(cgidir)
+	@(cd $(srcdir)/../cgi-bin && cp -rp * $(cgidir))
 
 install-support:
 	@echo Installing Support Binaries
 	@test -d $(bindir) || $(mkinstalldirs) $(bindir)
-	@cp -rp $(srcdir)/support/httpd.exp $(bindir)
-	@cp -rp $(builddir)/support/htpasswd $(bindir)
-	@cp -rp $(builddir)/support/htdigest $(bindir)
-	@cp -rp $(builddir)/support/rotatelogs $(bindir)
-	@cp -rp $(builddir)/support/logresolve $(bindir)
-	@cp -rp $(builddir)/support/ab $(bindir)
+	@cp -p $(srcdir)/support/httpd.exp $(bindir)
+	@cp -p $(builddir)/support/htpasswd $(bindir)
+	@cp -p $(builddir)/support/htdigest $(bindir)
+	@cp -p $(builddir)/support/rotatelogs $(bindir)
+	@cp -p $(builddir)/support/logresolve $(bindir)
+	@cp -p $(builddir)/support/ab $(bindir)
 
 install-other:
 	@test -d $(logdir) || $(mkinstalldirs) $(logdir)
@@ -78,7 +78,7 @@ install-include:
 	@test -d $(includedir)     || $(mkinstalldirs) $(includedir)
 	@test -d $(includedir)/xml || $(mkinstalldirs) $(includedir)/xml
 	@test -d $(includedir)/apr || $(mkinstalldirs) $(includedir)/apr
-	@cp include/*.h $(srcdir)/include/*.h $(includedir)
-	@cp $(srcdir)/lib/expat-lite/*.h $(includedir)/xml
-	@cp lib/apr/include/*.h $(srcdir)/lib/apr/include/*.h $(includedir)/apr
+	@cp -p include/*.h $(srcdir)/include/*.h $(includedir)
+	@cp -p $(srcdir)/lib/expat-lite/*.h $(includedir)/xml
+	@cp -p lib/apr/include/*.h $(srcdir)/lib/apr/include/*.h $(includedir)/apr
 	@chmod 644 $(includedir)/*.h $(includedir)/xml/*.h $(includedir)/apr/*.h