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
|
$NetBSD: patch-aa,v 1.13 2004/11/26 23:07:59 jlam Exp $
--- Makefile.in.orig 2004-08-26 09:01:18.000000000 -0400
+++ Makefile.in
@@ -4,7 +4,7 @@ CLEAN_SUBDIRS = test
PROGRAM_NAME = $(progname)
PROGRAM_SOURCES = modules.c
-PROGRAM_LDADD = $(HTTPD_LDFLAGS) $(PROGRAM_DEPENDENCIES) $(EXTRA_LIBS) $(AP_LIBS) $(LIBS)
+PROGRAM_LDADD = $(HTTPD_LDFLAGS) $(DL_LDFLAGS) $(PROGRAM_DEPENDENCIES) $(EXTRA_LIBS) $(AP_LIBS) $(LIBS) $(DL_LIBS)
PROGRAM_DEPENDENCIES = \
$(BUILTIN_LIBS) \
$(MPM_LIB) \
@@ -14,7 +14,7 @@ PROGRAM_DEPENDENCIES = \
PROGRAMS = $(PROGRAM_NAME)
TARGETS = $(PROGRAMS) $(shared_build) $(other_targets)
PHONY_TARGETS = $(srcdir)/buildmark.c
-INSTALL_TARGETS = install-conf install-htdocs install-error install-icons \
+INSTALL_TARGETS = install-htdocs install-error install-icons \
install-other install-cgi install-include install-suexec install-man \
install-build
@@ -71,6 +71,7 @@ install-conf:
< $$i; \
fi \
) > $(DESTDIR)$(sysconfdir)/$$i; \
+ if false; then \
chmod 0644 $(DESTDIR)$(sysconfdir)/$$i; \
file=`echo $$i|sed s/-std//`; \
if [ "$$file" = "httpd.conf" ]; then \
@@ -79,13 +80,16 @@ install-conf:
if test "$$file" != "$$i" && test ! -f $(DESTDIR)$(sysconfdir)/$$file; then \
$(INSTALL_DATA) $(DESTDIR)$(sysconfdir)/$$i $(DESTDIR)$(sysconfdir)/$$file; \
fi; \
+ fi; \
done ; \
done ; \
if test -f "$(builddir)/envvars-std"; then \
cp -p envvars-std $(DESTDIR)$(sbindir); \
+ if false; then \
if test ! -f $(DESTDIR)$(sbindir)/envvars; then \
cp -p envvars-std $(DESTDIR)$(sbindir)/envvars ; \
fi ; \
+ fi ; \
fi
install-build:
@@ -93,8 +97,6 @@ install-build:
@test -d $(DESTDIR)$(installbuilddir) || $(MKINSTALLDIRS) $(DESTDIR)$(installbuilddir)
@cp $(top_srcdir)/build/*.mk $(DESTDIR)$(installbuilddir); \
cp build/*.mk $(DESTDIR)$(installbuilddir); \
- sed 's#LIBTOOL = \(.*\)#LIBTOOL = $(SHELL) $(installbuilddir)/libtool $(LTFLAGS)#' \
- build/config_vars.mk > $(DESTDIR)$(installbuilddir)/config_vars.mk; \
cp $(top_srcdir)/build/instdso.sh $(DESTDIR)$(installbuilddir); \
cp $(top_builddir)/config.nice $(DESTDIR)$(installbuilddir);
@@ -108,7 +110,7 @@ dox::
doxygen $(top_srcdir)/docs/doxygen.conf
install-htdocs:
- -@if [ -d $(DESTDIR)$(htdocsdir) ]; then \
+ -@if false; then \
echo "[PRESERVING EXISTING HTDOCS SUBDIR: $(DESTDIR)$(htdocsdir)]"; \
else \
echo Installing HTML documents ; \
@@ -118,7 +120,7 @@ install-htdocs:
fi
install-error:
- -@if [ -d $(DESTDIR)$(errordir) ]; then \
+ -@if false; then \
echo "[PRESERVING EXISTING ERROR SUBDIR: $(DESTDIR)$(errordir)]"; \
else \
echo Installing error documents ; \
@@ -128,7 +130,7 @@ install-error:
fi
install-icons:
- -@if [ -d $(DESTDIR)$(iconsdir) ]; then \
+ -@if false; then \
echo "[PRESERVING EXISTING ICONS SUBDIR: $(DESTDIR)$(iconsdir)]"; \
else \
echo Installing icons ; \
@@ -138,7 +140,7 @@ install-icons:
fi
install-cgi:
- -@if [ -d $(DESTDIR)$(cgidir) ];then \
+ -@if false; then \
echo "[PRESERVING EXISTING CGI SUBDIR: $(DESTDIR)$(cgidir)]"; \
else \
echo Installing CGIs ; \
@@ -191,8 +193,6 @@ install-man:
@test -d $(DESTDIR)$(manualdir) || $(MKINSTALLDIRS) $(DESTDIR)$(manualdir)
@cp -p $(top_srcdir)/docs/man/*.1 $(DESTDIR)$(mandir)/man1
@cp -p $(top_srcdir)/docs/man/*.8 $(DESTDIR)$(mandir)/man8
- @(cd $(top_srcdir)/docs/manual && cp -rp * $(DESTDIR)$(manualdir))
- @(cd $(DESTDIR)$(manualdir) && find . -name "CVS" -type d -print | xargs rm -rf 2>/dev/null ) || true
install-suexec:
@if test -f $(builddir)/support/suexec; then \
|
