7b11121421
- use ${OPTION}_IMPLIES and remove some IGNORES
- turn on proxy_html and xml2enc as default [1]
[1] Often requested by users. The modules are not enabled in
the default configuration.
Full changelog for apache version 2.4.19/2.4.20:
http://www.apache.org/dist/httpd/CHANGES_2.4.20
Note: Apache httpd 2.4.19 was not released.
MFH: 2016Q2
106 lines
4.6 KiB
Text
106 lines
4.6 KiB
Text
--- Makefile.in.orig 2016-03-20 15:51:49 UTC
|
|
+++ Makefile.in
|
|
@@ -32,12 +32,9 @@ include $(top_srcdir)/build/program.mk
|
|
install-conf:
|
|
@echo Installing configuration files
|
|
@$(MKINSTALLDIRS) $(DESTDIR)$(sysconfdir) $(DESTDIR)$(sysconfdir)/extra
|
|
- @$(MKINSTALLDIRS) $(DESTDIR)$(sysconfdir)/original/extra
|
|
@cd $(top_srcdir)/docs/conf; \
|
|
for i in mime.types magic; do \
|
|
- if test ! -f $(DESTDIR)$(sysconfdir)/$$i; then \
|
|
- $(INSTALL_DATA) $$i $(DESTDIR)$(sysconfdir); \
|
|
- fi; \
|
|
+ $(INSTALL_DATA) $$i $(DESTDIR)$(sysconfdir)/$${i}.sample; \
|
|
done; \
|
|
for j in $(top_srcdir)/docs/conf $(top_builddir)/docs/conf ; do \
|
|
cd $$j ; \
|
|
@@ -98,15 +95,12 @@ install-conf:
|
|
-e 's#@@SSLPort@@#$(SSLPORT)#g' \
|
|
< $$i; \
|
|
fi \
|
|
- ) > $(DESTDIR)$(sysconfdir)/original/$$i; \
|
|
- chmod 0644 $(DESTDIR)$(sysconfdir)/original/$$i; \
|
|
+ ) > $(DESTDIR)$(sysconfdir)/$${i}.sample; \
|
|
+ chmod 0644 $(DESTDIR)$(sysconfdir)/$${i}.sample; \
|
|
file=$$i; \
|
|
if [ "$$i" = "httpd.conf" ]; then \
|
|
file=`echo $$i|sed s/.*.conf/$(PROGRAM_NAME).conf/`; \
|
|
fi; \
|
|
- if test ! -f $(DESTDIR)$(sysconfdir)/$$file; then \
|
|
- $(INSTALL_DATA) $(DESTDIR)$(sysconfdir)/original/$$i $(DESTDIR)$(sysconfdir)/$$file; \
|
|
- fi; \
|
|
fi; \
|
|
done ; \
|
|
done ; \
|
|
@@ -157,48 +151,25 @@ dox:
|
|
doxygen $(top_srcdir)/docs/doxygen.conf
|
|
|
|
install-htdocs:
|
|
- -@if [ -d $(DESTDIR)$(htdocsdir) ]; then \
|
|
- echo "[PRESERVING EXISTING HTDOCS SUBDIR: $(DESTDIR)$(htdocsdir)]"; \
|
|
- else \
|
|
- echo Installing HTML documents ; \
|
|
+ @echo Installing HTML documents ; \
|
|
$(MKINSTALLDIRS) $(DESTDIR)$(htdocsdir) ; \
|
|
- if test -d $(htdocs-srcdir) && test "x$(RSYNC)" != "x" && test -x $(RSYNC) ; then \
|
|
- $(RSYNC) --exclude .svn -rlpt --numeric-ids $(htdocs-srcdir)/ $(DESTDIR)$(htdocsdir)/; \
|
|
- else \
|
|
- test -d $(htdocs-srcdir) && (cd $(htdocs-srcdir) && cp -rp * $(DESTDIR)$(htdocsdir)) ; \
|
|
- cd $(DESTDIR)$(htdocsdir) && find . -name ".svn" -type d -print | xargs rm -rf 2>/dev/null || true; \
|
|
- fi; \
|
|
- fi
|
|
+ $(MKINSTALLDIRS) $(DESTDIR)$(DATADIR)/misc ; \
|
|
+ test -d $(htdocs-srcdir) && (cd $(htdocs-srcdir) && cp -rp index.html $(DESTDIR)$(DATADIR)/misc) || true
|
|
|
|
install-error:
|
|
- -@if [ -d $(DESTDIR)$(errordir) ]; then \
|
|
- echo "[PRESERVING EXISTING ERROR SUBDIR: $(DESTDIR)$(errordir)]"; \
|
|
- else \
|
|
- echo Installing error documents ; \
|
|
+ @echo Installing error documents ; \
|
|
$(MKINSTALLDIRS) $(DESTDIR)$(errordir) ; \
|
|
- cd $(top_srcdir)/docs/error && cp -rp * $(DESTDIR)$(errordir) ; \
|
|
- test "x$(errordir)" != "x" && cd $(DESTDIR)$(errordir) && find . -name ".svn" -type d -print | xargs rm -rf 2>/dev/null || true; \
|
|
- fi
|
|
+ cd $(top_srcdir)/docs/error && cp -rp * $(DESTDIR)$(errordir) ;
|
|
|
|
install-icons:
|
|
- -@if [ -d $(DESTDIR)$(iconsdir) ]; then \
|
|
- echo "[PRESERVING EXISTING ICONS SUBDIR: $(DESTDIR)$(iconsdir)]"; \
|
|
- else \
|
|
- echo Installing icons ; \
|
|
+ @echo Installing icons ; \
|
|
$(MKINSTALLDIRS) $(DESTDIR)$(iconsdir) ; \
|
|
- cd $(top_srcdir)/docs/icons && cp -rp * $(DESTDIR)$(iconsdir) ; \
|
|
- test "x$(iconsdir)" != "x" && cd $(DESTDIR)$(iconsdir) && find . -name ".svn" -type d -print | xargs rm -rf 2>/dev/null || true; \
|
|
- fi
|
|
+ cd $(top_srcdir)/docs/icons && cp -rp * $(DESTDIR)$(iconsdir) ;
|
|
|
|
install-cgi:
|
|
- -@if [ -d $(DESTDIR)$(cgidir) ];then \
|
|
- echo "[PRESERVING EXISTING CGI SUBDIR: $(DESTDIR)$(cgidir)]"; \
|
|
- else \
|
|
- echo Installing CGIs ; \
|
|
+ @echo Installing CGIs ; \
|
|
$(MKINSTALLDIRS) $(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; \
|
|
- fi
|
|
+ cd $(top_srcdir)/docs/cgi-examples && cp -rp * $(DESTDIR)$(cgidir) ;
|
|
|
|
install-other:
|
|
@test -d $(DESTDIR)$(logfiledir) || $(MKINSTALLDIRS) $(DESTDIR)$(logfiledir)
|
|
@@ -252,12 +223,7 @@ install-man:
|
|
@test -d $(DESTDIR)$(manualdir) || $(MKINSTALLDIRS) $(DESTDIR)$(manualdir)
|
|
@cp -p $(top_srcdir)/docs/man/*.1 $(DESTDIR)$(mandir)/man1
|
|
@cp -p $(top_srcdir)/docs/man/*.8 $(DESTDIR)$(mandir)/man8
|
|
- @if test "x$(RSYNC)" != "x" && test -x $(RSYNC) ; then \
|
|
- $(RSYNC) --exclude .svn -rlpt --numeric-ids $(top_srcdir)/docs/manual/ $(DESTDIR)$(manualdir)/; \
|
|
- else \
|
|
- 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; \
|
|
- fi
|
|
+ cd $(top_srcdir)/docs/manual && cp -rp * $(DESTDIR)$(manualdir)
|
|
|
|
install-suexec:
|
|
@if test -f $(builddir)/support/suexec; then \
|