blob: b0f108c37db26247c097a9dd1aa0791903272926 (
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
|
*** Makefile.tmpl.orig Tue Apr 14 23:17:36 1998
--- Makefile.tmpl Tue Apr 21 23:48:17 1998
***************
*** 207,218 ****
$(MKDIR) $(mandir)/man1
$(MKDIR) $(mandir)/man8
$(MKDIR) $(sysconfdir)
! $(MKDIR) $(datadir)/htdocs
$(MKDIR) $(datadir)/icons
! $(MKDIR) $(datadir)/cgi-bin
$(MKDIR) $(localstatedir)/$(localstatesubdir_logs)
$(MKDIR) $(localstatedir)/$(localstatesubdir_run)
! $(MKDIR) $(localstatedir)/proxy
$(MKDIR) $(includedir)
@echo "<=== [mktree]"
--- 207,218 ----
$(MKDIR) $(mandir)/man1
$(MKDIR) $(mandir)/man8
$(MKDIR) $(sysconfdir)
! $(MKDIR) $(datadir)/data.default
$(MKDIR) $(datadir)/icons
! $(MKDIR) $(datadir)/cgi-bin.default
$(MKDIR) $(localstatedir)/$(localstatesubdir_logs)
$(MKDIR) $(localstatedir)/$(localstatesubdir_run)
! $(MKDIR) $(datadir)/proxy
$(MKDIR) $(includedir)
@echo "<=== [mktree]"
***************
*** 311,327 ****
install-docroot:
@echo "===> [docroot: Installing initial DocumentRoot files]"
-(cd $(ROOT)/htdocs/ && $(TAR) cf - *) |\
! (cd $(datadir)/htdocs/ && $(TAR) xf -)
! -find $(datadir)/htdocs/ -type d -exec chmod a+rx {} \;
! -find $(datadir)/htdocs/ -type f -exec chmod a+r {} \;
-(cd $(ROOT)/icons/ && $(TAR) cf - *) |\
(cd $(datadir)/icons/ && $(TAR) xf -)
-find $(datadir)/icons/ -type d -exec chmod a+rx {} \;
-find $(datadir)/icons/ -type f -exec chmod a+r {} \;
-(cd $(ROOT)/cgi-bin/ && $(TAR) cf - *) |\
! (cd $(datadir)/cgi-bin/ && $(TAR) xf -)
! -find $(datadir)/cgi-bin/ -type d -exec chmod a+rx {} \;
! -find $(datadir)/cgi-bin/ -type f -exec chmod a+r {} \;
@echo "<=== [docroot]"
# create the initial configuration by providing default files
--- 311,333 ----
install-docroot:
@echo "===> [docroot: Installing initial DocumentRoot files]"
-(cd $(ROOT)/htdocs/ && $(TAR) cf - *) |\
! (cd $(datadir)/data.default/ && $(TAR) xf -)
! -find $(datadir)/data.default/ -type d -exec chmod a+rx {} \;
! -find $(datadir)/data.default/ -type f -exec chmod a+r {} \;
! if [ ! -d $(datadir)/data ]; then \
! $(CP) -Rp $(datadir)/data.default $(datadir)/data; \
! fi
-(cd $(ROOT)/icons/ && $(TAR) cf - *) |\
(cd $(datadir)/icons/ && $(TAR) xf -)
-find $(datadir)/icons/ -type d -exec chmod a+rx {} \;
-find $(datadir)/icons/ -type f -exec chmod a+r {} \;
-(cd $(ROOT)/cgi-bin/ && $(TAR) cf - *) |\
! (cd $(datadir)/cgi-bin.default/ && $(TAR) xf -)
! -find $(datadir)/cgi-bin.default/ -type d -exec chmod a+rx {} \;
! -find $(datadir)/cgi-bin.default/ -type f -exec chmod a+r {} \;
! if [ ! -d $(datadir)/cgi-bin ]; then \
! $(CP) -Rp $(datadir)/cgi-bin.default $(datadir)/cgi-bin; \
! fi
@echo "<=== [docroot]"
# create the initial configuration by providing default files
***************
*** 335,351 ****
echo ""; \
cat $(ROOT)/conf/$$conf-dist ) |\
sed -e '/# LoadModule/r .install.conf' \
! -e 's;@@ServerRoot@@/htdocs;$(datadir)/htdocs;' \
! -e 's;@@ServerRoot@@/htdocs;$(datadir)/htdocs;' \
-e 's;@@ServerRoot@@/icons;$(datadir)/icons;' \
-e 's;@@ServerRoot@@/cgi-bin;$(datadir)/cgi-bin;' \
! -e 's;@@ServerRoot@@/proxy;$(localstatedir)/proxy;' \
-e 's;@@ServerRoot@@;$(prefix);' \
-e 's;logs/accept.lock;$(localstatedir)/$(localstatesubdir_run)/httpd.lock;' \
-e 's;logs/apache_status;$(localstatedir)/$(localstatesubdir_run)/httpd.scoreboard;' \
-e 's;logs/httpd.pid;$(localstatedir)/$(localstatesubdir_run)/httpd.pid;' \
! -e 's;logs/access_log;$(localstatedir)/$(localstatesubdir_logs)/access_log;' \
! -e 's;logs/error_log;$(localstatedir)/$(localstatesubdir_logs)/error_log;' \
>.install.tmp && \
echo "$(INSTALL_DATA) .install.tmp $(sysconfdir)/$$conf.default"; \
$(INSTALL_DATA) .install.tmp $(sysconfdir)/$$conf.default; \
--- 341,356 ----
echo ""; \
cat $(ROOT)/conf/$$conf-dist ) |\
sed -e '/# LoadModule/r .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;$(datadir)/proxy;' \
-e 's;@@ServerRoot@@;$(prefix);' \
-e 's;logs/accept.lock;$(localstatedir)/$(localstatesubdir_run)/httpd.lock;' \
-e 's;logs/apache_status;$(localstatedir)/$(localstatesubdir_run)/httpd.scoreboard;' \
-e 's;logs/httpd.pid;$(localstatedir)/$(localstatesubdir_run)/httpd.pid;' \
! -e 's;logs/access_log;$(localstatedir)/$(localstatesubdir_logs)/httpd-access.log;' \
! -e 's;logs/error_log;$(localstatedir)/$(localstatesubdir_logs)/httpd-error.log;' \
>.install.tmp && \
echo "$(INSTALL_DATA) .install.tmp $(sysconfdir)/$$conf.default"; \
$(INSTALL_DATA) .install.tmp $(sysconfdir)/$$conf.default; \
***************
*** 356,363 ****
echo "[PRESERVING EXISTING CONFIG FILE: $(sysconfdir)/$$conf]"; \
fi; \
done
! $(CP) $(ROOT)/conf/mime.types $(sysconfdir)/mime.types
! $(CP) $(ROOT)/conf/magic $(sysconfdir)/magic
@echo "<=== [config]"
--- 361,374 ----
echo "[PRESERVING EXISTING CONFIG FILE: $(sysconfdir)/$$conf]"; \
fi; \
done
! $(INSTALL_DATA) $(ROOT)/conf/mime.types $(sysconfdir)/mime.types.default
! if [ ! -f "$(sysconfdir)/mime.types" ]; then \
! $(INSTALL_DATA) $(ROOT)/conf/mime.types $(sysconfdir)/mime.types; \
! fi
! $(INSTALL_DATA) $(ROOT)/conf/magic $(sysconfdir)/magic.default
! if [ ! -f "$(sysconfdir)/magic" ]; then \
! $(INSTALL_DATA) $(ROOT)/conf/magic $(sysconfdir)/magic; \
! fi
@echo "<=== [config]"
|
