blob: 9bf6caa7ab4d06cd2a5b1c9325706aff6e6f4271 (
plain) (
blame)
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
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
|
*** Makefile.tmpl.orig Sat Sep 19 07:41:48 1998
--- Makefile.tmpl Wed Oct 14 19:07:18 1998
***************
*** 107,112 ****
--- 107,113 ----
runtimedir = @runtimedir@
logfiledir = @logfiledir@
proxycachedir = @proxycachedir@
+ doc_prefix = $(prefix)/share/doc/apache
libexecdir_relative = @libexecdir_relative@
***************
*** 166,173 ****
-DUID_MIN=$(suexec_uidmin) \
-DGID_MIN=$(suexec_gidmin) \
-DUSERDIR_SUFFIX=\"$(suexec_userdir)\" \
! -DLOG_EXEC=\"$(logfiledir)/suexec_log\" \
! -DDOC_ROOT=\"$(datadir)/htdocs\" \
-DSAFE_PATH=\"$(suexec_safepath)\" \
' \
suexec; \
--- 167,174 ----
-DUID_MIN=$(suexec_uidmin) \
-DGID_MIN=$(suexec_gidmin) \
-DUSERDIR_SUFFIX=\"$(suexec_userdir)\" \
! -DLOG_EXEC=\"$(logfiledir)/httpd-suexec.log\" \
! -DDOC_ROOT=\"$(datadir)/data\" \
-DSAFE_PATH=\"$(suexec_safepath)\" \
' \
suexec; \
***************
*** 224,232 ****
$(MKDIR) $(root)$(mandir)/man1
$(MKDIR) $(root)$(mandir)/man8
$(MKDIR) $(root)$(sysconfdir)
! $(MKDIR) $(root)$(datadir)/htdocs
$(MKDIR) $(root)$(datadir)/icons
! $(MKDIR) $(root)$(datadir)/cgi-bin
$(MKDIR) $(root)$(includedir)
$(MKDIR) $(root)$(runtimedir)
$(MKDIR) $(root)$(logfiledir)
--- 225,233 ----
$(MKDIR) $(root)$(mandir)/man1
$(MKDIR) $(root)$(mandir)/man8
$(MKDIR) $(root)$(sysconfdir)
! $(MKDIR) $(root)$(doc_prefix)
$(MKDIR) $(root)$(datadir)/icons
! $(MKDIR) $(root)$(datadir)/cgi-bin.default
$(MKDIR) $(root)$(includedir)
$(MKDIR) $(root)$(runtimedir)
$(MKDIR) $(root)$(logfiledir)
***************
*** 340,364 ****
# 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 - *) |\
--- 341,372 ----
# 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)$(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 {} \; ; \
! # fi
! if [ ! -d $(root)$(datadir)/data ]; then \
! $(CP) -rp $(root)$(doc_prefix) $(root)$(datadir)/data; \
fi
! $(LN) -sf $(root)$(doc_prefix) $(root)$(datadir)/data.default
! # -@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.default/$${script}"; \
! $(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(datadir)/cgi-bin.default/$${script}; \
done; \
+ # fi
+ if [ ! -d $(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 - *) |\
***************
*** 378,395 ****
echo ""; \
cat $(TOP)/conf/$${conf}-dist ) |\
sed -e '/# LoadModule/r $(TOP)/$(SRC)/.apaci.install.conf' \
! -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);' \
-e 's;@@ServerRoot@@;$(prefix);' \
-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);' \
--- 386,405 ----
echo ""; \
cat $(TOP)/conf/$${conf}-dist ) |\
sed -e '/# LoadModule/r $(TOP)/$(SRC)/.apaci.install.conf' \
! -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);' \
+ -e 's;@@ServerRoot@@/srm.conf;$(sysconfdir)/srm.conf;' \
+ -e 's;@@ServerRoot@@/access.conf;$(sysconfdir)/access.conf;' \
-e 's;@@ServerRoot@@;$(prefix);' \
-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);' \
|
