rse 98/04/12 05:52:40
Modified: . Makefile.tmpl
Log:
Make APACI's "make install" more robust
by using tar-based command instead of "cp -R" commands.
Revision Changes Path
1.15 +7 -3 apache-1.3/Makefile.tmpl
Index: Makefile.tmpl
===================================================================
RCS file: /export/home/cvs/apache-1.3/Makefile.tmpl,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- Makefile.tmpl 1998/04/11 15:22:02 1.14
+++ Makefile.tmpl 1998/04/12 12:52:39 1.15
@@ -77,6 +77,7 @@
# build tools
CP = cp
+TAR = tar
MKDIR = $(AUX)/mkdir.sh
INSTALL = $(AUX)/install.sh -c
INSTALL_PROGRAM = $(INSTALL) -s -m 755
@@ -342,13 +343,16 @@
# icons and distributed CGI scripts.
install-docroot:
@echo "===> [docroot: Installing initial DocumentRoot files]"
- -$(CP) -R $(ROOT)/htdocs/* $(datadir)/htdocs/
+ -(cd $(ROOT)/htdocs/ && $(TAR) cf - *) |\
+ (cd $(datadir)/htdocs/ && $(TAR) xf -)
-find $(datadir)/htdocs/ -type d -exec chmod a+rx {} \;
-find $(datadir)/htdocs/ -type f -exec chmod a+r {} \;
- -$(CP) -R $(ROOT)/icons/* $(datadir)/icons/
+ -(cd $(ROOT)/icons/ && $(TAR) cf - *) |\
+ (cd $(datadir)/icons/ && $(TAR) xf -)
-find $(datadir)/icons/ -type d -exec chmod a+rx {} \;
-find $(datadir)/icons/ -type f -exec chmod a+r {} \;
- -$(CP) -R $(ROOT)/cgi-bin/* $(datadir)/cgi-bin/
+ -(cd $(ROOT)/cgi-bin/ && $(TAR) cf - *) |\
+ (cd $(datadir)/cgi-bin/ && $(TAR) xf -)
-find $(datadir)/cgi-bin/ -type d -exec chmod a+rx {} \;
-find $(datadir)/cgi-bin/ -type f -exec chmod a+r {} \;
@echo "<=== [docroot]"
