summaryrefslogtreecommitdiff
path: root/www/apache2/patches/patch-aa
blob: 4105a5bee45bb95494f1519e384403e7139beec9 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
$NetBSD: patch-aa,v 1.2 2002/03/05 23:56:22 jlam Exp $

--- Makefile.in.orig	Wed Jan 23 02:10:16 2002
+++ Makefile.in
@@ -16,7 +16,7 @@
 PROGRAMS        = $(PROGRAM_NAME)
 TARGETS         = $(PROGRAMS) $(shared_build) $(other_targets)
 PHONY_TARGETS   = $(srcdir)/buildmark.c
-INSTALL_TARGETS = install-conf install-htdocs install-error install-icons \
+INSTALL_TARGETS = install-htdocs install-error install-icons \
 	install-other install-cgi install-include install-suexec install-man \
 	install-build
 
@@ -66,8 +66,22 @@
 					-e 's#@@Port@@#$(PORT)#g' \
 					< $$i; \
 			fi \
-		) > $(sysconfdir)/$$i; \
+		) | \
+		sed -e 's#\([ 	]\)conf/#\1$(sysconfdir)/#g' \
+			-e 's#\([: 	]\)logs/#\1$(logfiledir)/#g' \
+			-e 's#\([: 	]\)modules/#\1$(libexecdir)/#g' \
+			-e 's#$(prefix)/cgi-bin#$(cgidir)#g' \
+			-e 's#$(prefix)/conf#$(sysconfdir)#g' \
+			-e 's#$(prefix)/error#$(errordir)#g' \
+			-e 's#$(prefix)/htdocs#$(htdocsdir)#g' \
+			-e 's#$(prefix)/icons#$(iconsdir)#g' \
+			-e 's#$(prefix)/manual#$(manualdir)#g' \
+			-e 's#$(logfiledir)\(/accept.lock\)#$(runtimedir)\1#g' \
+			-e 's#$(logfiledir)\(/apache_runtime_status\)#$(runtimedir)\1#g' \
+			-e 's#$(logfiledir)\(/httpd\.pid\)#$(runtimedir)\1#g' \
+			> $(sysconfdir)/$$i; \
 		chmod 0644 $(sysconfdir)/$$i; \
+		if false; then \
 		file=`echo $$i|sed s/-std//`; \
 		if [ "$$file" = "httpd.conf" ]; then \
 			file=`echo $$file|sed s/.*.conf/$(PROGRAM_NAME).conf/`; \
@@ -75,11 +89,14 @@
 		if test "$$file" != "$$i" && test ! -f $(sysconfdir)/$$file; then \
 			$(INSTALL_DATA) $(sysconfdir)/$$i $(sysconfdir)/$$file; \
 		fi; \
+		fi; \
 	done
 	@if test -f "$(builddir)/envvars-std"; then \
 	    cp -p envvars-std $(sbindir); \
+	    if false; then \
 	    if test ! -f $(sbindir)/envvars; then \
 	        cp -p envvars-std $(sbindir)/envvars ; \
+	    fi ; \
 	    fi ; \
 	fi