Annotation of /trunk/apache2/patches/apache2-2.4.3-default-server-root.patch
Parent Directory
| 
Revision Log
Revision 1928 -
(hide annotations)
(download)
Wed Oct 31 11:33:28 2012 UTC (11 years, 7 months ago) by niro
File size: 1499 byte(s)
Wed Oct 31 11:33:28 2012 UTC (11 years, 7 months ago) by niro
File size: 1499 byte(s)
-rediffed patches and added mod_systemd patch
| 1 | niro | 1928 | diff -Naur httpd-2.4.3/Makefile.in httpd-2.4.3-magellan/Makefile.in |
| 2 | --- httpd-2.4.3/Makefile.in 2012-01-22 23:30:14.000000000 +0000 | ||
| 3 | +++ httpd-2.4.3-magellan/Makefile.in 2012-10-31 12:17:22.119254612 +0000 | ||
| 4 | @@ -46,14 +46,14 @@ | ||
| 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 | @@ -68,12 +68,12 @@ | ||
| 22 | if test "$(LOAD_ALL_MODULES)" = "yes"; then \ | ||
| 23 | loading_disabled=""; \ | ||
| 24 | fi; \ | ||
| 25 | - echo "$${loading_disabled}LoadModule $${j}_module $(rel_libexecdir)/mod_$${j}.so"; \ | ||
| 26 | + echo "$${loading_disabled}LoadModule $${j}_module modules/mod_$${j}.so"; \ | ||
| 27 | fi; \ | ||
| 28 | done; \ | ||
| 29 | sed -e '1,/@@LoadModule@@/d' \ | ||
| 30 | -e '/@@LoadModule@@/d' \ | ||
| 31 | - -e 's#@@ServerRoot@@#$(prefix)#g' \ | ||
| 32 | + -e 's#@@ServerRoot@@#$(libdir)/apache2#g' \ | ||
| 33 | -e 's#@@Port@@#$(PORT)#g' \ | ||
| 34 | -e 's#@@SSLPort@@#$(SSLPORT)#g' \ | ||
| 35 | < $$i; \ |