*** Makefile.tmpl.orig	Wed Sep 23 13:44:14 1998
--- Makefile.tmpl	Wed Sep 23 13:48:29 1998
***************
*** 107,112 ****
--- 107,113 ----
  runtimedir      = @runtimedir@
  logfiledir      = @logfiledir@
  proxycachedir   = @proxycachedir@
+ doc_prefix      = $(prefix)/share/doc/apache
  
  libexecdir_relative   = @libexecdir_relative@
  
***************
*** 176,182 ****
  			-DGID_MIN=$(suexec_gidmin) \
  			-DUSERDIR_SUFFIX=\"$(suexec_userdir)\" \
  			-DLOG_EXEC=\"$(logfiledir)/suexec_log\" \
! 			-DDOC_ROOT=\"$(datadir)/htdocs\" \
  			-DSAFE_PATH=\"$(suexec_safepath)\" \
  		' \
  		suexec; \
--- 177,183 ----
  			-DGID_MIN=$(suexec_gidmin) \
  			-DUSERDIR_SUFFIX=\"$(suexec_userdir)\" \
  			-DLOG_EXEC=\"$(logfiledir)/suexec_log\" \
! 			-DDOC_ROOT=\"$(datadir)/data\" \
  			-DSAFE_PATH=\"$(suexec_safepath)\" \
  		' \
  		suexec; \
***************
*** 273,281 ****
  	$(MKDIR) $(root)$(sysconfdir)/ssl.crt
  	$(MKDIR) $(root)$(sysconfdir)/ssl.csr
  	$(MKDIR) $(root)$(sysconfdir)/ssl.key
! 	$(MKDIR) $(root)$(datadir)/htdocs
  	$(MKDIR) $(root)$(datadir)/icons
! 	$(MKDIR) $(root)$(datadir)/cgi-bin
  	$(MKDIR) $(root)$(includedir)
  	$(MKDIR) $(root)$(runtimedir)
  	$(MKDIR) $(root)$(logfiledir)
--- 274,282 ----
  	$(MKDIR) $(root)$(sysconfdir)/ssl.crt
  	$(MKDIR) $(root)$(sysconfdir)/ssl.csr
  	$(MKDIR) $(root)$(sysconfdir)/ssl.key
! 	$(MKDIR) $(root)$(doc_prefix)
  	$(MKDIR) $(root)$(datadir)/icons
! 	$(MKDIR) $(root)$(datadir)/cgi-bin.default
  	$(MKDIR) $(root)$(includedir)
  	$(MKDIR) $(root)$(runtimedir)
  	$(MKDIR) $(root)$(logfiledir)
***************
*** 393,417 ****
  #   icons and distributed CGI scripts.
  install-data:
  	@echo "===> [data: Installing initial data files]"
! 	-@if [ -f $(root)$(datadir)/htdocs/index.html ]; then \
! 		echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(datadir)/htdocs/]"; \
! 	else \
! 		echo "Copying tree $(TOP)/htdocs/ -> $(root)$(datadir)/htdocs/"; \
  		(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 {} \; ; \
! 	fi
! 	-@if [ -f $(root)$(datadir)/cgi-bin/printenv ]; then \
! 		echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(datadir)/cgi-bin/]"; \
! 	else \
  		for script in printenv test-cgi; do \
  			cat $(TOP)/cgi-bin/$${script} |\
  			sed -e 's;^#!/.*perl;#!$(PERL);' \
          		> $(TOP)/$(SRC)/.apaci.install.tmp; \
! 			echo "$(INSTALL_DATA) $(TOP)/conf/$${script}[*] $(root)$(datadir)/cgi-bin/$${script}"; \
! 			$(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(datadir)/cgi-bin/$${script}; \
  		done; \
  	fi
  	@echo "Copying tree $(TOP)/icons/ -> $(root)$(datadir)/icons/"; \
  	(cd $(TOP)/icons/ && $(TAR) cf - *) |\
--- 394,417 ----
  #   icons and distributed CGI scripts.
  install-data:
  	@echo "===> [data: Installing initial data files]"
! 		echo "Copying tree $(TOP)/htdocs/ -> $(root)$(doc_prefix)/"; \
  		(cd $(TOP)/htdocs/ && $(TAR) cf - *) |\
! 		(cd $(root)$(doc_prefix)/ && $(TAR) xf -); \
! 		find $(root)$(doc_prefix)/ -type d -exec chmod a+rx {} \; ; \
! 		find $(root)$(doc_prefix)/ -type f -exec chmod a+r {} \; ; \
! 	 if [ ! -e $(root)$(datadir)/data ]; then \
! 		$(LN) -sf $(root)$(doc_prefix) $(root)$(datadir)/data; \
! 	 fi
! 	 $(LN) -sf $(root)$(doc_prefix) $(root)$(datadir)/data.default
  		for script in printenv test-cgi; do \
  			cat $(TOP)/cgi-bin/$${script} |\
  			sed -e 's;^#!/.*perl;#!$(PERL);' \
          		> $(TOP)/$(SRC)/.apaci.install.tmp; \
! 			echo "$(INSTALL_DATA) $(TOP)/conf/$${script}[*] $(root)$(datadir)/cgi-bin.default/$${script}"; \
! 			$(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(datadir)/cgi-bin.default/$${script}; \
  		done; \
+ 	if [ ! -e $(root)$(datadir)/cgi-bin ]; then \
+ 		$(LN) -sf $(root)$(datadir)/cgi-bin.default $(root)$(datadir)/cgi-bin; \
  	fi
  	@echo "Copying tree $(TOP)/icons/ -> $(root)$(datadir)/icons/"; \
  	(cd $(TOP)/icons/ && $(TAR) cf - *) |\
***************
*** 436,442 ****
  			-e 's;@@ServerRoot@@/logs/ssl_misc_log;$(logfiledir)/ssl_misc_log;' \
  			-e 's;@@ServerRoot@@/conf/ssl.crt;$(sysconfdir)/ssl.crt;' \
  			-e 's;@@ServerRoot@@/conf/ssl.key;$(sysconfdir)/ssl.key;' \
! 			-e 's;@@ServerRoot@@/htdocs;$(datadir)/htdocs;' \
  			-e 's;@@ServerRoot@@/icons;$(datadir)/icons;' \
  			-e 's;@@ServerRoot@@/cgi-bin;$(datadir)/cgi-bin;' \
  			-e 's;@@ServerRoot@@/proxy;$(proxycachedir);' \
--- 436,442 ----
  			-e 's;@@ServerRoot@@/logs/ssl_misc_log;$(logfiledir)/ssl_misc_log;' \
  			-e 's;@@ServerRoot@@/conf/ssl.crt;$(sysconfdir)/ssl.crt;' \
  			-e 's;@@ServerRoot@@/conf/ssl.key;$(sysconfdir)/ssl.key;' \
!  			-e 's;@@ServerRoot@@/htdocs;$(datadir)/data;' \
  			-e 's;@@ServerRoot@@/icons;$(datadir)/icons;' \
  			-e 's;@@ServerRoot@@/cgi-bin;$(datadir)/cgi-bin;' \
  			-e 's;@@ServerRoot@@/proxy;$(proxycachedir);' \
***************
*** 444,453 ****
  			-e 's;logs/accept.lock;$(runtimedir)/httpd.lock;' \
  			-e 's;logs/apache_runtime_status;$(runtimedir)/httpd.scoreboard;' \
  			-e 's;logs/httpd.pid;$(runtimedir)/httpd.pid;' \
! 			-e 's;logs/access_log;$(logfiledir)/access_log;' \
! 			-e 's;logs/error_log;$(logfiledir)/error_log;' \
! 			-e 's;logs/referer_log;$(logfiledir)/referer_log;' \
! 			-e 's;logs/agent_log;$(logfiledir)/agent_log;' \
  			-e 's;conf/magic;$(sysconfdir)/magic;' \
  			-e 's;conf/mime.types;$(sysconfdir)/mime.types;' \
  			-e 's;Group #-1;Group $(conf_group);' \
--- 444,453 ----
  			-e 's;logs/accept.lock;$(runtimedir)/httpd.lock;' \
  			-e 's;logs/apache_runtime_status;$(runtimedir)/httpd.scoreboard;' \
  			-e 's;logs/httpd.pid;$(runtimedir)/httpd.pid;' \
! 			-e 's;logs/access_log;$(logfiledir)/httpd-access.log;' \
! 			-e 's;logs/error_log;$(logfiledir)/httpd-error.log;' \
! 			-e 's;logs/referer_log;$(logfiledir)/httpd-referer.log;' \
! 			-e 's;logs/agent_log;$(logfiledir)/httpd-agent.log;' \
  			-e 's;conf/magic;$(sysconfdir)/magic;' \
  			-e 's;conf/mime.types;$(sysconfdir)/mime.types;' \
  			-e 's;Group #-1;Group $(conf_group);' \
