Change that diff to what is attached. Or just move that line that is added
down two line either or!
--- Makefile.tmpl.orig Fri Jul 10 12:10:45 1998
+++ Makefile.tmpl Sun Jul 12 01:53:54 1998
@@ -167,7 +167,7 @@
-DGID_MIN=$(suexec_gidmin) \
-DUSERDIR_SUFFIX=\"$(suexec_userdir)\" \
-DLOG_EXEC=\"$(logfiledir)/suexec_log\" \
- -DDOC_ROOT=\"$(datadir)/htdocs\" \
+ -DDOC_ROOT=\"$(datadir)/html\" \
-DSAFE_PATH=\"$(suexec_safepath)\" \
' \
suexec; \
@@ -224,7 +224,7 @@
$(MKDIR) $(root)$(mandir)/man1
$(MKDIR) $(root)$(mandir)/man8
$(MKDIR) $(root)$(sysconfdir)
- $(MKDIR) $(root)$(datadir)/htdocs
+ $(MKDIR) $(root)$(datadir)/html
$(MKDIR) $(root)$(datadir)/icons
$(MKDIR) $(root)$(datadir)/cgi-bin
$(MKDIR) $(root)$(includedir)
@@ -341,11 +341,11 @@
[EMAIL PROTECTED] [ -f $(root)$(datadir)/htdocs/index.html ]; then \
echo "[PRESERVING EXISTING DATA SUBDIR:
$(root)$(datadir)/htdocs/]"; \
else \
- echo "Copying tree $(TOP)/htdocs/ ->
$(root)$(datadir)/htdocs/"; \
+ echo "Copying tree $(TOP)/htdocs/ -> $(root)$(datadir)/html/"; \
(cd $(TOP)/htdocs/ && $(TAR) cf - *) |\
- (cd $(root)$(datadir)/htdocs/ && $(TAR) xf -); \
- find $(root)$(datadir)/htdocs/ -type d -exec chmod a+rx {} \; ;
\
- find $(root)$(datadir)/htdocs/ -type f -exec chmod a+r {} \; ; \
+ (cd $(root)$(datadir)/html/ && $(TAR) xf -); \
+ find $(root)$(datadir)/html/ -type d -exec chmod a+rx {} \; ; \
+ find $(root)$(datadir)/html/ -type f -exec chmod a+r {} \; ; \
fi
[EMAIL PROTECTED] [ -f $(root)$(datadir)/cgi-bin/printenv ]; then \
echo "[PRESERVING EXISTING DATA SUBDIR:
$(root)$(datadir)/cgi-bin/]"; \
@@ -353,6 +353,7 @@
echo "Copying tree $(TOP)/cgi-bin/ ->
$(root)$(datadir)/cgi-bin/"; \
(cd $(TOP)/cgi-bin/ && $(TAR) cf - *) |\
(cd $(root)$(datadir)/cgi-bin/ && $(TAR) xf -); \
+ sed -e 's;^#!/.*;#!$(PERL);' < $(TOP)/cgi-bin/printenv >
$(root)$(datadir)/cgi-bin/printenv \
find $(root)$(datadir)/cgi-bin/ -type d -exec chmod a+rx {} \;
; \
find $(root)$(datadir)/cgi-bin/ -type f -exec chmod a+r {} \; ;
\
fi
@@ -367,15 +368,15 @@
# and initial config files while preserving existing ones.
install-config:
@echo "===> [config: Installing Apache configuration files]"
- [EMAIL PROTECTED] conf in httpd.conf access.conf srm.conf; do \
+ [EMAIL PROTECTED] conf in httpd.conf access.conf srm.conf
highperformance.conf; do \
(echo "##"; \
echo "## $${conf} -- Apache HTTP server configuration file"; \
echo "##"; \
echo ""; \
cat $(TOP)/conf/$${conf}-dist ) |\
sed -e '/# LoadModule/r $(TOP)/$(SRC)/.apaci.install.conf' \
- -e 's;@@ServerRoot@@/htdocs;$(datadir)/htdocs;' \
- -e 's;@@ServerRoot@@/htdocs;$(datadir)/htdocs;' \
+ -e 's;@@ServerRoot@@/html;$(datadir)/html;' \
+ -e 's;@@ServerRoot@@/html;$(datadir)/html;' \
-e 's;@@ServerRoot@@/icons;$(datadir)/icons;' \
-e 's;@@ServerRoot@@/cgi-bin;$(datadir)/cgi-bin;' \
-e 's;@@ServerRoot@@/proxy;$(proxycachedir);' \
