]>
Commit | Line | Data |
---|---|---|
3a13f014 | 1 | diff -uNr apache_1.3.10.orig/Makefile.tmpl apache_1.3.10/Makefile.tmpl |
2 | --- apache_1.3.10.orig/Makefile.tmpl Tue Jan 11 20:47:41 2000 | |
3 | +++ apache_1.3.10/Makefile.tmpl Tue Jan 18 14:12:31 2000 | |
4 | @@ -315,7 +315,14 @@ | |
5 | done; \ | |
6 | fi; \ | |
7 | fi | |
8 | - $(INSTALL_DATA) $(TOP)/$(SRC)/support/httpd.8 $(root)$(mandir)/man8/$(TARGET).8 | |
9 | + cat $(TOP)/$(SRC)/support/httpd.8 |\ | |
10 | + sed -e 's;@@ServerRoot@@;$(prefix);' \ | |
11 | + -e 's;@@SysconfDir@@;$(sysconfdir);' \ | |
12 | + -e 's;@@LogfileDir@@;$(logfiledir);' \ | |
13 | + -e 's;@@RuntimeDir@@;$(runtimedir);' \ | |
14 | + > $(TOP)/$(SRC)/.apaci.install.tmp | |
15 | + $(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp \ | |
16 | + $(root)$(mandir)/man8/$(TARGET).8 | |
17 | -@$(RM) $(SRC)/.apaci.install.conf; touch $(SRC)/.apaci.install.conf | |
18 | -@if [ ".`grep '^[ ]*SharedModule' $(TOP)/$(SRC)/Configuration.apaci`" != . ]; then \ | |
19 | for mod in `egrep '^[ ]*SharedModule' $(TOP)/$(SRC)/Configuration.apaci |\ | |
20 | diff -uNr apache_1.3.10.orig/src/support/httpd.8 apache_1.3.10/src/support/httpd.8 | |
21 | --- apache_1.3.10.orig/src/support/httpd.8 Tue Aug 10 15:54:47 1999 | |
22 | +++ apache_1.3.10/src/support/httpd.8 Tue Jan 18 14:10:55 2000 | |
23 | @@ -133,7 +133,7 @@ | |
24 | .BI \-d " serverroot" | |
25 | Set the initial value for the ServerRoot directive to \fIserverroot\fP. This | |
26 | can be overridden by the ServerRoot command in the configuration file. The | |
27 | -default is \fB/usr/local/apache\fP. | |
28 | +default is \fB@@ServerRoot@@\fP. | |
29 | .TP | |
30 | .BI \-f " config" | |
31 | Execute the commands in the file \fIconfig\fP on startup. If \fIconfig\fP | |
32 | @@ -191,21 +191,21 @@ | |
33 | , and then exit. | |
34 | .SH FILES | |
35 | .PD 0 | |
36 | -.B /usr/local/apache/conf/httpd.conf | |
37 | +.B @@SysconfDir@@/httpd.conf | |
38 | .br | |
39 | -.B /usr/local/apache/conf/srm.conf | |
40 | +.B @@SysconfDir@@/srm.conf | |
41 | .br | |
42 | -.B /usr/local/apache/conf/access.conf | |
43 | +.B @@SysconfDir@@/access.conf | |
44 | .br | |
45 | -.B /usr/local/apache/conf/mime.types | |
46 | +.B @@SysconfDir@@/mime.types | |
47 | .br | |
48 | -.B /usr/local/apache/conf/magic | |
49 | +.B @@SysconfDir@@/magic | |
50 | .br | |
51 | -.B /usr/local/apache/logs/error_log | |
52 | +.B @@LogfileDir@@/error_log | |
53 | .br | |
54 | -.B /usr/local/apache/logs/access_log | |
55 | +.B @@LogfileDir@@/access_log | |
56 | .br | |
57 | -.B /usr/local/apache/logs/httpd.pid | |
58 | +.B @@RuntimeDir@@/httpd.pid | |
59 | .PD | |
60 | .SH SEE ALSO | |
61 | .BR inetd (8). |