blob: ebeb3fe22fe2cb6799e19227558126a557db85d6 (
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
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
|
$NetBSD: patch-aa,v 1.10 1999/05/07 13:46:43 tv Exp $
--- Makefile.tmpl.orig Fri May 7 09:49:05 1999
+++ Makefile.tmpl Fri May 7 09:52:16 1999
@@ -114,7 +114,7 @@
datadir = @datadir@
iconsdir = $(datadir)/icons
htdocsdir = $(datadir)/htdocs
-cgidir = $(datadir)/cgi-bin
+cgidir = $(prefix)/libexec/cgi-bin
includedir = @includedir@
localstatedir = @localstatedir@
runtimedir = @runtimedir@
@@ -344,34 +344,6 @@
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]"
@@ -453,12 +425,13 @@
find $(root)$(htdocsdir)/ -type d -exec chmod a+rx {} \; ; \
find $(root)$(htdocsdir)/ -type f -exec chmod a+r {} \; ; \
fi
- -@if [ -f $(root)$(cgidir)/printenv ]; then \
+ -@if false; then \
echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(cgidir)/]"; \
else \
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}; \
@@ -475,7 +448,7 @@
# 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 \
|
