martin 99/12/02 13:00:25
Modified: . Makefile.tmpl
Log:
Oops. My recent change was a bit too hasty. Of course, the user may
(and WILL, if he had apache-1.3.[0-9] before) have a file called
index.html in his .../htdocs/
Accept the presence of either index.html or index.html.en as
a clue for an existing htdocs tree.
Revision Changes Path
1.93 +1 -1 apache-1.3/Makefile.tmpl
Index: Makefile.tmpl
===================================================================
RCS file: /export/home/cvs/apache-1.3/Makefile.tmpl,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- Makefile.tmpl 1999/12/01 21:21:21 1.92
+++ Makefile.tmpl 1999/12/02 21:00:19 1.93
@@ -441,7 +441,7 @@
# icons and distributed CGI scripts.
install-data:
@echo "===> [data: Installing initial data files]"
- [EMAIL PROTECTED] [ -f $(root)$(htdocsdir)/index.html.en ]; then \
+ [EMAIL PROTECTED] [ -f $(root)$(htdocsdir)/index.html ] || [ -f
$(root)$(htdocsdir)/index.html.en ]; then \
echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(htdocsdir)/]";
\
else \
echo "Copying tree $(TOP)/htdocs/ -> $(root)$(htdocsdir)/"; \
