Annotation of /trunk/apache2/patches/apache2-2.2.9-default-server-root.patch
Parent Directory | Revision Log
Revision 668 -
(hide annotations)
(download)
Sat Aug 2 14:41:34 2008 UTC (16 years, 1 month ago) by niro
File size: 1437 byte(s)
Sat Aug 2 14:41:34 2008 UTC (16 years, 1 month ago) by niro
File size: 1437 byte(s)
-re-diffed for 2.2.9
1 | niro | 668 | diff -Naur httpd-2.2.9/Makefile.in httpd-2.2.9-magellan/Makefile.in |
2 | --- httpd-2.2.9/Makefile.in 2008-02-05 00:00:07.000000000 +0100 | ||
3 | +++ httpd-2.2.9-magellan/Makefile.in 2008-08-02 16:27:38.000000000 +0200 | ||
4 | @@ -45,26 +45,26 @@ | ||
5 | ( \ | ||
6 | n_lm=`awk 'BEGIN {n=0} /@@LoadModule@@/ {n+=1} END {print n}' < $$i`; \ | ||
7 | if test $$n_lm -eq 0 -o "x$(DSO_MODULES)" = "x"; then \ | ||
8 | - sed -e 's#@@ServerRoot@@#$(prefix)#g' \ | ||
9 | + sed -e 's#@@ServerRoot@@#$(libdir)/apache2#g' \ | ||
10 | -e 's#@@Port@@#$(PORT)#g' \ | ||
11 | -e 's#@@SSLPort@@#$(SSLPORT)#g' \ | ||
12 | -e '/@@LoadModule@@/d' \ | ||
13 | < $$i; \ | ||
14 | else \ | ||
15 | sed -n -e '/@@LoadModule@@/q' \ | ||
16 | - -e 's#@@ServerRoot@@#$(prefix)#g' \ | ||
17 | + -e 's#@@ServerRoot@@#$(libdir)/apache2#g' \ | ||
18 | -e 's#@@Port@@#$(PORT)#g' \ | ||
19 | -e 's#@@SSLPort@@#$(SSLPORT)#g' \ | ||
20 | -e 'p' \ | ||
21 | < $$i; \ | ||
22 | for j in $(DSO_MODULES) "^EOL^"; do \ | ||
23 | if test $$j != "^EOL^"; then \ | ||
24 | - echo "LoadModule $${j}_module $(rel_libexecdir)/mod_$${j}.so"; \ | ||
25 | + echo "LoadModule $${j}_module modules/mod_$${j}.so"; \ | ||
26 | fi; \ | ||
27 | done; \ | ||
28 | sed -e '1,/@@LoadModule@@/d' \ | ||
29 | -e '/@@LoadModule@@/d' \ | ||
30 | - -e 's#@@ServerRoot@@#$(prefix)#g' \ | ||
31 | + -e 's#@@ServerRoot@@#$(libdir)/apache2#g' \ | ||
32 | -e 's#@@Port@@#$(PORT)#g' \ | ||
33 | -e 's#@@SSLPort@@#$(SSLPORT)#g' \ | ||
34 | < $$i; \ |