Annotation of /trunk/apache2/patches/apache2-2.2.4-default-server-root-2.patch
Parent Directory
| 
Revision Log
Revision 231 -
(hide annotations)
(download)
Sat Jun 30 02:24:36 2007 UTC (16 years, 11 months ago) by niro
File size: 1318 byte(s)
Sat Jun 30 02:24:36 2007 UTC (16 years, 11 months ago) by niro
File size: 1318 byte(s)
files for apache-2.2.4-r1
| 1 | niro | 231 | diff -Naur httpd-2.2.4/Makefile.in httpd-2.2.4-magellan/Makefile.in |
| 2 | --- httpd-2.2.4/Makefile.in 2005-11-13 07:33:15.000000000 +0100 | ||
| 3 | +++ httpd-2.2.4-magellan/Makefile.in 2007-06-30 02:55:31.000000000 +0200 | ||
| 4 | @@ -45,24 +45,24 @@ | ||
| 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 '/@@LoadModule@@/d' \ | ||
| 12 | < $$i; \ | ||
| 13 | else \ | ||
| 14 | sed -n -e '/@@LoadModule@@/q' \ | ||
| 15 | - -e 's#@@ServerRoot@@#$(prefix)#g' \ | ||
| 16 | + -e 's#@@ServerRoot@@#$(libdir)/apache2#g' \ | ||
| 17 | -e 's#@@Port@@#$(PORT)#g' \ | ||
| 18 | -e 'p' \ | ||
| 19 | < $$i; \ | ||
| 20 | for j in $(DSO_MODULES) "^EOL^"; do \ | ||
| 21 | if test $$j != "^EOL^"; then \ | ||
| 22 | - echo "LoadModule $${j}_module $(rel_libexecdir)/mod_$${j}.so"; \ | ||
| 23 | + echo "LoadModule $${j}_module modules/mod_$${j}.so"; \ | ||
| 24 | fi; \ | ||
| 25 | done; \ | ||
| 26 | sed -e '1,/@@LoadModule@@/d' \ | ||
| 27 | -e '/@@LoadModule@@/d' \ | ||
| 28 | - -e 's#@@ServerRoot@@#$(prefix)#g' \ | ||
| 29 | + -e 's#@@ServerRoot@@#$(libdir)/apache2#g' \ | ||
| 30 | -e 's#@@Port@@#$(PORT)#g' \ | ||
| 31 | < $$i; \ | ||
| 32 | fi \ |