Magellan Linux

  • Back to homepage
    • /[pkg-src]/trunk/apache2/patches/apache2-2.4.16-default-server-root.patch

    Contents of /trunk/apache2/patches/apache2-2.4.16-default-server-root.patch

    Parent Directory Parent Directory | Revision Log Revision Log

    Revision 2625 - (show annotations) (download)
    Mon Jul 20 07:51:44 2015 UTC (8 years, 9 months ago) by niro
    File size: 1546 byte(s) 
    -re-diffed for 2.4.16
    1 diff -Naur httpd-2.4.16/Makefile.in httpd-2.4.16-magellan/Makefile.in
    2 --- httpd-2.4.16/Makefile.in 2015-04-15 20:06:04.000000000 +0200
    3 +++ httpd-2.4.16-magellan/Makefile.in 2015-07-20 09:55:42.004677605 +0200
    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 @@ -87,13 +87,13 @@
    22 echo " $${loading_disabled}LoadModule $${j}_module $(rel_libexecdir)/mod_$${j}.so"; \
    23 echo "</IfModule>"; \
    24 else \
    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 fi; \
    29 done; \
    30 sed -e '1,/@@LoadModule@@/d' \
    31 -e '/@@LoadModule@@/d' \
    32 - -e 's#@@ServerRoot@@#$(prefix)#g' \
    33 + -e 's#@@ServerRoot@@#$(libdir)/apache2#g' \
    34 -e 's#@@Port@@#$(PORT)#g' \
    35 -e 's#@@SSLPort@@#$(SSLPORT)#g' \
    36 < $$i; \