$NetBSD: patch-aa,v 1.3 1999/09/01 07:41:03 itojun Exp $ --- Makefile.tmpl.orig Thu Aug 12 23:58:18 1999 +++ Makefile.tmpl Wed Sep 1 00:08:27 1999 @@ -450,12 +450,13 @@ find $(root)$(htdocsdir)/ -type d -exec chmod a+rx {} \; ; \ find $(root)$(htdocsdir)/ -type f -exec chmod a+r {} \; ; \ fi - -@if [ -f $(root)$(cgidir)/printenv ]; then \ + -@if false; then \ echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(cgidir)/]"; \ else \ for script in printenv test-cgi; do \ cat $(TOP)/cgi-bin/$${script} |\ sed -e 's;^#!/.*perl;#!$(PERL);' \ + -e 's;LD_LIBRARY_PATH=.*;LD_LIBRARY_PATH=/usr/lib:$(prefix)/lib:/usr/local/lib;' \ > $(TOP)/$(SRC)/.apaci.install.tmp; \ echo "$(INSTALL_DATA) $(TOP)/conf/$${script}[*] $(root)$(cgidir)/$${script}"; \ $(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(cgidir)/$${script}; \ @@ -472,7 +473,7 @@ # and initial config files while preserving existing ones. install-config: @echo "===> [config: Installing Apache configuration files]" - -@for conf in httpd.conf access.conf srm.conf; do \ + -@for conf in httpd.conf; do \ if [ .$$conf = .httpd.conf ]; then \ target_conf="$(TARGET).conf"; \ else \