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
154
155
156
157
158
|
$NetBSD: patch-aa,v 1.22.2.2 2004/05/31 22:26:04 grant Exp $
--- Makefile.tmpl.orig 2004-05-13 22:18:11.000000000 +0100
+++ Makefile.tmpl
@@ -56,6 +56,8 @@ INSTALL_DATA = $(INSTALL) $(IFLAGS_DA
PERL = @PERL@
TAR = @TAR@
TAROPT = @TAROPT@
+BINOWN = @BINOWN@
+BINGRP = @BINGRP@
# installation name of Apache webserver
TARGET = @TARGET@
@@ -280,11 +282,6 @@ install-mktree:
$(MKDIR) $(root)$(mandir)/man1
$(MKDIR) $(root)$(mandir)/man8
$(MKDIR) $(root)$(sysconfdir)
- $(MKDIR) $(root)$(sysconfdir)/ssl.crt
- $(MKDIR) $(root)$(sysconfdir)/ssl.crl
- $(MKDIR) $(root)$(sysconfdir)/ssl.csr
- $(MKDIR) $(root)$(sysconfdir)/ssl.key
- $(MKDIR) $(root)$(sysconfdir)/ssl.prm
$(MKDIR) $(root)$(htdocsdir)
$(MKDIR) $(root)$(manualdir)
$(MKDIR) $(root)$(iconsdir)
@@ -296,9 +293,9 @@ install-mktree:
$(MKDIR) $(root)$(proxycachedir)
-@if [ "x`$(AUX)/getuid.sh`" = "x0" ]; then \
echo "chown $(conf_user) $(root)$(proxycachedir)"; \
- chown $(conf_user) $(root)$(proxycachedir); \
+ ${CHOWN} $(conf_user) $(root)$(proxycachedir); \
echo "chgrp $(conf_group) $(root)$(proxycachedir)"; \
- chgrp "$(conf_group)" $(root)$(proxycachedir); \
+ ${CHGRP} "$(conf_group)" $(root)$(proxycachedir); \
fi
@echo "<=== [mktree]"
@@ -343,34 +340,6 @@ install-programs:
file=`echo $${mod} | sed -e 's;^.*/\([^/]*\);\1;'`; \
echo "$(INSTALL_DSO) $(TOP)/$(SRC)/$${mod} $(root)$(libexecdir)/$${file}"; \
$(INSTALL_DSO) $(TOP)/$(SRC)/$${mod} $(root)$(libexecdir)/$${file}; \
- name=`$(TOP)/$(AUX)/fmn.sh $(TOP)/$(SRC)/$${mod}`; \
- if [ ".$$name" = .ssl_module ]; then \
- echo "<IfDefine SSL>" >>$(SRC)/.apaci.install.conf; \
- fi; \
- echo dummy | awk '{ printf("LoadModule %-18s %s\n", modname, modpath); }' \
- modname="$${name}" modpath="$(libexecdir_relative)$${file}" >>$(SRC)/.apaci.install.conf; \
- if [ ".$$name" = .ssl_module ]; then \
- echo "</IfDefine>" >>$(SRC)/.apaci.install.conf; \
- fi; \
- done; \
- echo "" >>$(SRC)/.apaci.install.conf; \
- echo "# Reconstruction of the complete module list from all available modules" >>$(SRC)/.apaci.install.conf; \
- echo "# (static and shared ones) to achieve correct module execution order." >>$(SRC)/.apaci.install.conf; \
- echo "# [WHENEVER YOU CHANGE THE LOADMODULE SECTION ABOVE UPDATE THIS, TOO]" >>$(SRC)/.apaci.install.conf; \
- echo "ClearModuleList" >>$(SRC)/.apaci.install.conf; \
- for mod in `egrep "^[ ]*(Add|Shared)Module" $(SRC)/Configuration.apaci |\
- sed -e 's:[ ]*SharedModule::' \
- -e 's:[ ]*AddModule::' \
- -e 's:modules/[^/]*/::' \
- -e 's:[ ]lib: mod_:' \
- -e 's:\.[soam]*$$:.c:'`; do \
- if [ ".$$mod" = .mod_ssl.c ]; then \
- echo "<IfDefine SSL>" >>$(SRC)/.apaci.install.conf; \
- fi; \
- echo "AddModule $$mod" >>$(SRC)/.apaci.install.conf; \
- if [ ".$$mod" = .mod_ssl.c ]; then \
- echo "</IfDefine>" >>$(SRC)/.apaci.install.conf; \
- fi; \
done; \
fi
@echo "<=== [programs]"
@@ -420,9 +389,9 @@ install-support:
echo "$(INSTALL_PROGRAM) $(TOP)/$(SRC)/support/suexec $(root)$(sbindir)/suexec"; \
$(INSTALL_PROGRAM) $(TOP)/$(SRC)/support/suexec $(root)$(sbindir)/suexec; \
echo "chown root $(root)$(sbindir)/suexec"; \
- chown root $(root)$(sbindir)/suexec; \
+ ${CHOWN} root $(root)$(sbindir)/suexec; \
echo "chmod 4711 $(root)$(sbindir)/suexec"; \
- chmod 4711 $(root)$(sbindir)/suexec; \
+ ${CHMOD} 4711 $(root)$(sbindir)/suexec; \
echo "$(INSTALL_DATA) $(TOP)/$(SRC)/support/suexec.8 $(root)$(mandir)/man8/suexec.8"; \
$(INSTALL_DATA) $(TOP)/$(SRC)/support/suexec.8 $(root)$(mandir)/man8/suexec.8; \
fi
@@ -464,9 +433,9 @@ install-binsupport:
echo "$(INSTALL_PROGRAM) $(TOP)/$(SRC)/support/suexec $(root)$(sbindir)/suexec"; \
$(INSTALL_PROGRAM) $(TOP)/$(SRC)/support/suexec $(root)$(sbindir)/suexec; \
echo "chown root $(root)$(sbindir)/suexec"; \
- chown root $(root)$(sbindir)/suexec; \
+ ${CHOWN} root $(root)$(sbindir)/suexec; \
echo "chmod 4711 $(root)$(sbindir)/suexec"; \
- chmod 4711 $(root)$(sbindir)/suexec; \
+ ${CHMOD} 4711 $(root)$(sbindir)/suexec; \
echo "$(INSTALL_DATA) $(TOP)/$(SRC)/support/suexec.8 $(root)$(mandir)/man8/suexec.8"; \
$(INSTALL_DATA) $(TOP)/$(SRC)/support/suexec.8 $(root)$(mandir)/man8/suexec.8; \
fi
@@ -489,21 +458,25 @@ install-include:
# icons and distributed CGI scripts.
install-data:
@echo "===> [data: Installing initial data files]"
- -@if [ -f $(root)$(htdocsdir)/index.html ] || [ -f $(root)$(htdocsdir)/index.html.en ]; then \
+ -@if false; then \
echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(htdocsdir)/]"; \
else \
echo "Copying tree $(TOP)/htdocs/ -> $(root)$(htdocsdir)/"; \
(cd $(TOP)/htdocs/ && $(TAR) $(TAROPT) - index* apache_pb.* ) |\
(cd $(root)$(htdocsdir)/ && $(TAR) -xf -); \
- find $(root)$(htdocsdir)/ -type d -exec chmod a+rx {} \; ; \
- find $(root)$(htdocsdir)/ -type f -print | xargs chmod a+r ; \
+ ${FIND} $(root)$(htdocsdir)/ -type d -exec ${CHMOD} a+rx {} \; ; \
+ ${FIND} $(root)$(htdocsdir)/ -type f -print | ${XARGS} ${CHMOD} a+r ; \
+ ${FIND} $(root)$(htdocsdir)/ -print | \
+ ${XARGS} ${CHOWN} ${BINOWN}:${BINGRP} ; \
fi
-@if [ -d $(TOP)/htdocs/manual ]; then \
echo "Copying tree $(TOP)/htdocs/manual -> $(root)/$(manualdir)/"; \
(cd $(TOP)/htdocs/manual/ && $(TAR) $(TAROPT) - *) |\
(cd $(root)$(manualdir)/ && $(TAR) -xf -); \
- find $(root)$(manualdir)/ -type d -exec chmod a+rx {} \; ; \
- find $(root)$(manualdir)/ -type f -print | xargs chmod a+r ; \
+ ${FIND} $(root)$(manualdir)/ -type d -exec ${CHMOD} a+rx {} \; ; \
+ ${FIND} $(root)$(manualdir)/ -type f -print | ${XARGS} ${CHMOD} a+r ; \
+ ${FIND} $(root)$(manualdir)/ -print | \
+ ${XARGS} ${CHOWN} ${BINOWN}:${BINGRP} ; \
fi
-@if [ -f $(root)$(cgidir)/printenv ]; then \
echo "[PRESERVING EXISTING CGI SUBDIR: $(root)$(cgidir)/]"; \
@@ -511,23 +484,25 @@ install-data:
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}; \
+ echo "$(INSTALL_SCRIPT) $(TOP)/conf/$${script}[*] $(root)$(cgidir)/$${script}"; \
+ $(INSTALL_SCRIPT) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(cgidir)/$${script}; \
done; \
fi
@echo "Copying tree $(TOP)/icons/ -> $(root)$(iconsdir)/"; \
(cd $(TOP)/icons/ && $(TAR) $(TAROPT) - *) |\
(cd $(root)$(iconsdir)/ && $(TAR) -xf -); \
- find $(root)$(iconsdir)/ -type d -exec chmod a+rx {} \; ;\
- find $(root)$(iconsdir)/ -type f -exec chmod a+r {} \;
+ ${FIND} $(root)$(iconsdir)/ -type d -exec ${CHMOD} a+rx {} \; ;\
+ ${FIND} $(root)$(iconsdir)/ -type f -exec ${CHMOD} a+r {} \; ;\
+ ${CHOWN} -R ${BINOWN}:${BINGRP} $(root)$(iconsdir)/.
@echo "<=== [data]"
# create the initial configuration by providing default files
# 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 \
|
