]> git.pld-linux.org Git - packages/dgee.git/blame - dgee-apache.patch
projects / packages / dgee.git / blame
? search:
summary | shortlog | log | commit | commitdiff | tree
blob | blame (incremental) | history | HEAD
- logrotate 3.8.0 requires "su" option for non-root writable dirs
[packages/dgee.git] / dgee-apache.patch
CommitLineData
5c892f31 1--- dgee-0.1.6/apache/Makefile.am~ Fri Oct 24 00:10:01 2003
2+++ dgee-0.1.6/apache/Makefile.am Sat Dec 6 00:40:29 2003
3@@ -64,7 +64,9 @@
4 fi
5
6 install-mod: $(MOD_DGEE) install-mod-conf
7- $(APXS) -i -S LIBEXECDIR=$(MOD_DGEE_DIR) -a $<
8+# $(APXS) -i -S LIBEXECDIR=$(MOD_DGEE_DIR) -a $<
53a86206
ER		 9+ $(mkinstalldirs) $(DESTDIR)$(libexecdir)/apache1/
10+ $(INSTALL) $(MOD_DGEE) $(DESTDIR)$(libexecdir)/apache1/
5c892f31 11
12 directories:
13
14--- dgee-0.1.6/apache/Makefile.am~ Sat Dec 6 00:50:13 2003
15+++ dgee-0.1.6/apache/Makefile.am Sat Dec 6 00:52:28 2003
16@@ -58,9 +58,9 @@
17 install-mod-conf:
18 if [ -e $(MOD_DGEE) ] ; \
19 then \
20- $(mkinstalldirs) $(DESTDIR)$(sysconfdir) ; \
21- [ "`id -u`" != 0 ] || chown -f @USER@:@GROUP@ $(DESTDIR)$(sysconfdir); \
22- $(INSTALL) $(MOD_DGEE_CONF) $(DESTDIR)$(sysconfdir) ; \
53a86206
ER		 23+ $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/apache/conf.d ; \
24+ [ "`id -u`" != 0 ] || chown -f @USER@:@GROUP@ $(DESTDIR)$(sysconfdir)/apache/conf.d; \
25+ $(INSTALL) $(MOD_DGEE_CONF) $(DESTDIR)$(sysconfdir)/apache/conf.d/40_mod_dgee.conf ; \
5c892f31 26 fi
27
28 install-mod: $(MOD_DGEE) install-mod-conf
53a86206
ER		 29--- dgee-0.1.6/configure.in~ 2003-10-30 23:26:50.000000000 +0200
30+++ dgee-0.1.6/configure.in 2006-03-05 11:37:32.000000000 +0200
31@@ -112,10 +112,10 @@
32 LMBASE=/usr/local
33 ])
34
35-APACHE=apache
36+APACHE=
37 dnl Location of Apache's apxs
38 AC_ARG_WITH(apache,
39- [ --with-apache=libpath Implicitly point to directory containing apache apxs (use --without to disable apache (v1) support) [Enabled]],
40+ [ --with-apache=libpath Enable Apache (and Implicitly point to directory containing apache apxs if required) [Disabled]],
41 [if test "$withval" = yes; then
42 APXSBASE=/usr/local/sbin
43 else
44--- dgee-0.1.6/configure.in~ 2006-03-05 11:56:03.000000000 +0200
45+++ dgee-0.1.6/configure.in 2006-03-05 12:00:21.000000000 +0200
46@@ -135,8 +135,8 @@
47 [ --with-apache2=libpath Enable Apache2 (and Implicitly point to directory containing apache2 apxs if required) [Disabled]],
48 [if test "$withval" = yes; then
49 APXS2BASE=/usr/local/sbin
50- APACHE2=apache2
51 else
52+ APACHE2=apache2
53 APXS2BASE=$withval
54 fi
55 AC_SUBST(APXS2BASE)
56--- dgee-0.1.6/configure.in~ 2006-03-05 12:00:21.000000000 +0200
57+++ dgee-0.1.6/configure.in 2006-03-05 12:02:19.000000000 +0200
58@@ -119,8 +119,9 @@
59 [if test "$withval" = yes; then
60 APXSBASE=/usr/local/sbin
61 else
62- APACHE=apache
63+ APACHE=apache
64 APXSBASE=$withval
65+ APXS=$withval
66 fi
67 AC_SUBST(APXSBASE)
68 ],[
69@@ -138,6 +139,7 @@
70 else
71 APACHE2=apache2
72 APXS2BASE=$withval
73+ APXS2=$withval
74 fi
75 AC_SUBST(APXS2BASE)
76 ],[
77@@ -274,10 +276,6 @@
78 test -n "$ARFLAGS" || ARFLAGS="cr"
79 AC_PROG_RANLIB
80
81-dnl Check for apxs in the path.
82-AC_PATH_PROG([APXS], [apxs], [/usr/local/sbin/apxs], [$APXSBASE:$PATH:/usr/local/sbin:/usr/sbin])
83-AC_PATH_PROG([APXS2], [apxs2], [/usr/local/sbin/apxs2], [$APXS2BASE:$PATH:/usr/local/sbin:/usr/sbin])
84-
85 dnl Checks for typedefs, structures, and compiler characteristics.
86 AC_C_CONST
87 AC_STRUCT_TM
88--- dgee-0.1.6/apache2/Makefile.am~ 2006-03-05 12:10:06.000000000 +0200
89+++ dgee-0.1.6/apache2/Makefile.am 2006-03-05 12:10:07.000000000 +0200
90@@ -68,7 +68,7 @@
91 fi
92
93 install-mod: $(MOD_DGEE2) install-mod-conf
94- $(APXS2) -i -S LIBEXECDIR=$(MOD_DGEE2_DIR) -a $<
95+ $(APXS2) -i -S DESTDIR=$(DESTDIR) $<
96
97 directories:
98
99--- dgee-0.1.6/apache2/Makefile.am~ 2006-03-05 12:10:35.000000000 +0200
100+++ dgee-0.1.6/apache2/Makefile.am 2006-03-05 12:11:40.000000000 +0200
101@@ -26,16 +26,6 @@
102
103 $(MOD_DGEE2): mod_dgee2.c replace
104 $(APXS2) -DEAPI -DDOTGNUVERSION="'\""$(DOTGNUVERSION)"\"'" -DDGVERSION="'\""$(DGVERSION)"\"'" $(ALLINC) -c mod_dgee2.c $(LFLAG)
105- @( if [ ! -e "$(MOD_DGEE2)" ] ; \
106- then \
107- echo Info: ERROR $(MOD_DGEE2) not created... ;\
108- echo Info: If this compile fails because apxs cannot be found, then ;\
109- echo Info: reconfigure DGEE with --with-apache2=directory where apache2 apxs;\
110- echo Info: may be found. If you don\'t have apxs installed, then you may;\
111- echo Info: be able to use the mod_dgee2.so in the ./precompiled directory.;\
112- echo Info: Do \"cp apache2/precompiled/mod_dgee2.so apache\" before doing;\
113- echo Info: the install if this is the case. ;\
114- fi )
115
116 replace:
117 $(edit) mod_dgee2.conf > mod_dgee2.conf.tmp
118--- dgee-0.1.6/apache2/Makefile.am~ 2006-03-05 12:12:11.000000000 +0200
119+++ dgee-0.1.6/apache2/Makefile.am 2006-03-05 12:13:05.000000000 +0200
120@@ -58,7 +58,7 @@
121 fi
122
123 install-mod: $(MOD_DGEE2) install-mod-conf
124- $(APXS2) -i -S DESTDIR=$(DESTDIR) $<
125+ $(APXS2) -i -S DESTDIR=$(DESTDIR) mod_dgee2.la
126
127 directories:
128
129--- dgee-0.1.6/apache2/Makefile.am~ 2006-03-05 12:13:15.000000000 +0200
130+++ dgee-0.1.6/apache2/Makefile.am 2006-03-05 12:23:00.000000000 +0200
131@@ -24,7 +24,7 @@
132
133 fresh: clean all
134
135-$(MOD_DGEE2): mod_dgee2.c replace
136+$(MOD_DGEE2): mod_dgee2.c
137 $(APXS2) -DEAPI -DDOTGNUVERSION="'\""$(DOTGNUVERSION)"\"'" -DDGVERSION="'\""$(DGVERSION)"\"'" $(ALLINC) -c mod_dgee2.c $(LFLAG)
138
139 replace:
140--- dgee-0.1.6/apache/Makefile.am~ 2006-03-05 12:23:22.000000000 +0200
141+++ dgee-0.1.6/apache/Makefile.am 2006-03-05 12:24:03.000000000 +0200
142@@ -63,8 +63,7 @@
143 $(INSTALL) $(MOD_DGEE_CONF) $(DESTDIR)$(sysconfdir)/apache/webapps.d ; \
144 fi
145
146-install-mod: $(MOD_DGEE) install-mod-conf
147-# $(APXS) -i -S LIBEXECDIR=$(MOD_DGEE_DIR) -a $<
148+install-mod: $(MOD_DGEE)
149 $(mkinstalldirs) $(DESTDIR)$(libexecdir)/apache1/
150 $(INSTALL) $(MOD_DGEE) $(DESTDIR)$(libexecdir)/apache1/
151
152--- dgee-0.1.6/apache2/Makefile.am~ 2006-03-05 12:23:00.000000000 +0200
153+++ dgee-0.1.6/apache2/Makefile.am 2006-03-05 12:24:34.000000000 +0200
154@@ -58,6 +58,7 @@
155 fi
156
157 install-mod: $(MOD_DGEE2) install-mod-conf
158+ $(mkinstalldirs) $(DESTDIR)$(libexecdir)/apache/
159 $(APXS2) -i -S DESTDIR=$(DESTDIR) mod_dgee2.la
160
161 directories:
162--- dgee-0.1.6/apache2/Makefile.am~ 2006-03-05 12:31:52.000000000 +0200
163+++ dgee-0.1.6/apache2/Makefile.am 2006-03-05 12:49:31.000000000 +0200
164@@ -25,7 +25,7 @@
165 fresh: clean all
166
167 $(MOD_DGEE2): mod_dgee2.c
168- $(APXS2) -DEAPI -DDOTGNUVERSION="'\""$(DOTGNUVERSION)"\"'" -DDGVERSION="'\""$(DGVERSION)"\"'" $(ALLINC) -c mod_dgee2.c $(LFLAG)
169+ $(APXS2) -DEAPI -DDOTGNUVERSION="'\""$(DOTGNUVERSION)"\"'" -DDGVERSION="'\""$(DGVERSION)"\"'" $(ALLINC) -c mod_dgee2.c -o mod_dgee.la $(LFLAG)
170
171 replace:
172 $(edit) mod_dgee2.conf > mod_dgee2.conf.tmp
173@@ -59,7 +59,7 @@
174
175 install-mod: $(MOD_DGEE2) install-mod-conf
176 $(mkinstalldirs) $(DESTDIR)$(libexecdir)/apache/
177- $(APXS2) -i -S DESTDIR=$(DESTDIR) mod_dgee2.la
178+ $(APXS2) -i -S DESTDIR=$(DESTDIR) mod_dgee.la
179
180 directories:
181
182--- dgee-0.1.6/apache2/Makefile.am~ 2006-03-05 12:51:56.000000000 +0200
183+++ dgee-0.1.6/apache2/Makefile.am 2006-03-05 12:54:18.000000000 +0200
184@@ -59,7 +59,7 @@
185
186 install-mod: $(MOD_DGEE2) install-mod-conf
187 $(mkinstalldirs) $(DESTDIR)$(libexecdir)/apache/
188- $(APXS2) -i -S DESTDIR=$(DESTDIR) mod_dgee.la
189+ $(APXS2) -i -n mod_dgee -S DESTDIR=$(DESTDIR) mod_dgee.la
190
191 directories:
192
The DotGNU Execution Environment Core
This page took 0.06948 seconds and 4 git commands to generate.