Changeset View
Changeset View
Standalone View
Standalone View
www/apache24/files/patch-Makefile.in
| --- Makefile.in.orig 2012-12-17 11:50:41 UTC | --- Makefile.in.orig 2015-04-15 18:06:04 UTC | ||||
| +++ Makefile.in | +++ Makefile.in | ||||
| @@ -32,12 +32,9 @@ include $(top_srcdir)/build/program.mk | @@ -32,12 +32,9 @@ include $(top_srcdir)/build/program.mk | ||||
| install-conf: | install-conf: | ||||
| @echo Installing configuration files | @echo Installing configuration files | ||||
| @$(MKINSTALLDIRS) $(DESTDIR)$(sysconfdir) $(DESTDIR)$(sysconfdir)/extra | @$(MKINSTALLDIRS) $(DESTDIR)$(sysconfdir) $(DESTDIR)$(sysconfdir)/extra | ||||
| - @$(MKINSTALLDIRS) $(DESTDIR)$(sysconfdir)/original/extra | - @$(MKINSTALLDIRS) $(DESTDIR)$(sysconfdir)/original/extra | ||||
| @cd $(top_srcdir)/docs/conf; \ | @cd $(top_srcdir)/docs/conf; \ | ||||
| for i in mime.types magic; do \ | for i in mime.types magic; do \ | ||||
| - if test ! -f $(DESTDIR)$(sysconfdir)/$$i; then \ | - if test ! -f $(DESTDIR)$(sysconfdir)/$$i; then \ | ||||
| - $(INSTALL_DATA) $$i $(DESTDIR)$(sysconfdir); \ | - $(INSTALL_DATA) $$i $(DESTDIR)$(sysconfdir); \ | ||||
| - fi; \ | - fi; \ | ||||
| + $(INSTALL_DATA) $$i $(DESTDIR)$(sysconfdir)/$${i}.sample; \ | + $(INSTALL_DATA) $$i $(DESTDIR)$(sysconfdir)/$${i}.sample; \ | ||||
| done; \ | done; \ | ||||
| for j in $(top_srcdir)/docs/conf $(top_builddir)/docs/conf ; do \ | for j in $(top_srcdir)/docs/conf $(top_builddir)/docs/conf ; do \ | ||||
| cd $$j ; \ | cd $$j ; \ | ||||
| @@ -58,6 +55,16 @@ install-conf: | @@ -98,15 +95,12 @@ install-conf: | ||||
| -e 's#@@SSLPort@@#$(SSLPORT)#g' \ | -e 's#@@SSLPort@@#$(SSLPORT)#g' \ | ||||
| -e 'p' \ | |||||
| < $$i; \ | < $$i; \ | ||||
| + if echo " $(DSO_MODULES) "|$(EGREP) " cgi " > /dev/null ; then \ | |||||
| + have_cgi="1"; \ | |||||
| + else \ | |||||
| + have_cgi="0"; \ | |||||
| + fi; \ | |||||
| + if echo " $(DSO_MODULES) "|$(EGREP) " cgid " > /dev/null ; then \ | |||||
| + have_cgid="1"; \ | |||||
| + else \ | |||||
| + have_cgid="0"; \ | |||||
| + fi; \ | |||||
| for j in $(DSO_MODULES) "^EOL^"; do \ | |||||
| if test $$j != "^EOL^"; then \ | |||||
| if echo ",$(ENABLED_DSO_MODULES),"|$(EGREP) ",$$j," > /dev/null ; then \ | |||||
| @@ -68,8 +75,18 @@ install-conf: | |||||
| if test "$(LOAD_ALL_MODULES)" = "yes"; then \ | |||||
| loading_disabled=""; \ | |||||
| fi; \ | |||||
| - echo "$${loading_disabled}LoadModule $${j}_module $(rel_libexecdir)/mod_$${j}.so"; \ | |||||
| - fi; \ | |||||
| + if test $$j = "cgid" -a "$$have_cgi" = "1"; then \ | |||||
| + echo "<IfModule !mpm_prefork_module>"; \ | |||||
| + echo " $${loading_disabled}LoadModule $${j}_module $(rel_libexecdir)/mod_$${j}.so"; \ | |||||
| + echo "</IfModule>"; \ | |||||
| + elif test $$j = "cgi" -a "$$have_cgid" = "1"; then \ | |||||
| + echo "<IfModule mpm_prefork_module>"; \ | |||||
| + echo " $${loading_disabled}LoadModule $${j}_module $(rel_libexecdir)/mod_$${j}.so"; \ | |||||
| + echo "</IfModule>"; \ | |||||
| + else \ | |||||
| + echo "$${loading_disabled}LoadModule $${j}_module $(rel_libexecdir)/mod_$${j}.so"; \ | |||||
| + fi; \ | |||||
| + fi; \ | |||||
| done; \ | |||||
| sed -e '1,/@@LoadModule@@/d' \ | |||||
| -e '/@@LoadModule@@/d' \ | |||||
| @@ -78,15 +95,12 @@ install-conf: | |||||
feld: This is now upstream | |||||
| -e 's#@@SSLPort@@#$(SSLPORT)#g' \ | |||||
| < $$i; \ | |||||
| fi \ | fi \ | ||||
| - ) > $(DESTDIR)$(sysconfdir)/original/$$i; \ | - ) > $(DESTDIR)$(sysconfdir)/original/$$i; \ | ||||
| - chmod 0644 $(DESTDIR)$(sysconfdir)/original/$$i; \ | - chmod 0644 $(DESTDIR)$(sysconfdir)/original/$$i; \ | ||||
| + ) > $(DESTDIR)$(sysconfdir)/$${i}.sample; \ | + ) > $(DESTDIR)$(sysconfdir)/$${i}.sample; \ | ||||
| + chmod 0644 $(DESTDIR)$(sysconfdir)/$${i}.sample; \ | + chmod 0644 $(DESTDIR)$(sysconfdir)/$${i}.sample; \ | ||||
| file=$$i; \ | file=$$i; \ | ||||
| if [ "$$i" = "httpd.conf" ]; then \ | if [ "$$i" = "httpd.conf" ]; then \ | ||||
| file=`echo $$i|sed s/.*.conf/$(PROGRAM_NAME).conf/`; \ | file=`echo $$i|sed s/.*.conf/$(PROGRAM_NAME).conf/`; \ | ||||
| fi; \ | fi; \ | ||||
| - if test ! -f $(DESTDIR)$(sysconfdir)/$$file; then \ | - if test ! -f $(DESTDIR)$(sysconfdir)/$$file; then \ | ||||
| - $(INSTALL_DATA) $(DESTDIR)$(sysconfdir)/original/$$i $(DESTDIR)$(sysconfdir)/$$file; \ | - $(INSTALL_DATA) $(DESTDIR)$(sysconfdir)/original/$$i $(DESTDIR)$(sysconfdir)/$$file; \ | ||||
| - fi; \ | - fi; \ | ||||
| fi; \ | fi; \ | ||||
| done ; \ | done ; \ | ||||
| done ; \ | done ; \ | ||||
| @@ -137,48 +151,25 @@ dox: | @@ -157,48 +151,25 @@ dox: | ||||
| doxygen $(top_srcdir)/docs/doxygen.conf | doxygen $(top_srcdir)/docs/doxygen.conf | ||||
| install-htdocs: | install-htdocs: | ||||
| - -@if [ -d $(DESTDIR)$(htdocsdir) ]; then \ | - -@if [ -d $(DESTDIR)$(htdocsdir) ]; then \ | ||||
| - echo "[PRESERVING EXISTING HTDOCS SUBDIR: $(DESTDIR)$(htdocsdir)]"; \ | - echo "[PRESERVING EXISTING HTDOCS SUBDIR: $(DESTDIR)$(htdocsdir)]"; \ | ||||
| - else \ | - else \ | ||||
| - echo Installing HTML documents ; \ | - echo Installing HTML documents ; \ | ||||
| + @echo Installing HTML documents ; \ | + @echo Installing HTML documents ; \ | ||||
| ▲ Show 20 Lines • Show All 41 Lines • ▼ Show 20 Lines | + @echo Installing CGIs ; \ | ||||
| $(MKINSTALLDIRS) $(DESTDIR)$(cgidir) ; \ | $(MKINSTALLDIRS) $(DESTDIR)$(cgidir) ; \ | ||||
| - cd $(top_srcdir)/docs/cgi-examples && cp -rp * $(DESTDIR)$(cgidir) ; \ | - cd $(top_srcdir)/docs/cgi-examples && cp -rp * $(DESTDIR)$(cgidir) ; \ | ||||
| - test "x$(cgidir)" != "x" && cd $(DESTDIR)$(cgidir) && find . -name ".svn" -type d -print | xargs rm -rf 2>/dev/null || true; \ | - test "x$(cgidir)" != "x" && cd $(DESTDIR)$(cgidir) && find . -name ".svn" -type d -print | xargs rm -rf 2>/dev/null || true; \ | ||||
| - fi | - fi | ||||
| + cd $(top_srcdir)/docs/cgi-examples && cp -rp * $(DESTDIR)$(cgidir) ; | + cd $(top_srcdir)/docs/cgi-examples && cp -rp * $(DESTDIR)$(cgidir) ; | ||||
| install-other: | install-other: | ||||
| @test -d $(DESTDIR)$(logfiledir) || $(MKINSTALLDIRS) $(DESTDIR)$(logfiledir) | @test -d $(DESTDIR)$(logfiledir) || $(MKINSTALLDIRS) $(DESTDIR)$(logfiledir) | ||||
| @@ -231,12 +222,7 @@ install-man: | @@ -251,12 +222,7 @@ install-man: | ||||
| @test -d $(DESTDIR)$(manualdir) || $(MKINSTALLDIRS) $(DESTDIR)$(manualdir) | @test -d $(DESTDIR)$(manualdir) || $(MKINSTALLDIRS) $(DESTDIR)$(manualdir) | ||||
| @cp -p $(top_srcdir)/docs/man/*.1 $(DESTDIR)$(mandir)/man1 | @cp -p $(top_srcdir)/docs/man/*.1 $(DESTDIR)$(mandir)/man1 | ||||
| @cp -p $(top_srcdir)/docs/man/*.8 $(DESTDIR)$(mandir)/man8 | @cp -p $(top_srcdir)/docs/man/*.8 $(DESTDIR)$(mandir)/man8 | ||||
| - @if test "x$(RSYNC)" != "x" && test -x $(RSYNC) ; then \ | - @if test "x$(RSYNC)" != "x" && test -x $(RSYNC) ; then \ | ||||
| - $(RSYNC) --exclude .svn -rlpt --numeric-ids $(top_srcdir)/docs/manual/ $(DESTDIR)$(manualdir)/; \ | - $(RSYNC) --exclude .svn -rlpt --numeric-ids $(top_srcdir)/docs/manual/ $(DESTDIR)$(manualdir)/; \ | ||||
| - else \ | - else \ | ||||
| - cd $(top_srcdir)/docs/manual && cp -rp * $(DESTDIR)$(manualdir); \ | - cd $(top_srcdir)/docs/manual && cp -rp * $(DESTDIR)$(manualdir); \ | ||||
| - cd $(DESTDIR)$(manualdir) && find . -name ".svn" -type d -print | xargs rm -rf 2>/dev/null || true; \ | - cd $(DESTDIR)$(manualdir) && find . -name ".svn" -type d -print | xargs rm -rf 2>/dev/null || true; \ | ||||
| - fi | - fi | ||||
| + cd $(top_srcdir)/docs/manual && cp -rp * $(DESTDIR)$(manualdir) | + cd $(top_srcdir)/docs/manual && cp -rp * $(DESTDIR)$(manualdir) | ||||
| install-suexec: | install-suexec: | ||||
| @if test -f $(builddir)/support/suexec; then \ | @if test -f $(builddir)/support/suexec; then \ | ||||
This is now upstream