3158N/APatch origin: in-house

3158N/APatch status: Solaris-specific; not suitable for upstream

3158N/A

3158N/A--- Makefile.in

3158N/A+++ Makefile.in

3158N/A@@ -50,6 +50,9 @@

278N/A -e 's#@@Port@@#$(PORT)#g' \

278N/A -e 's#@@SSLPort@@#$(SSLPORT)#g' \

278N/A -e '/@@LoadModule@@/d' \

278N/A+ -e 's#@@SysconfDir@@#$(sysconfdir)#g' \

278N/A+ -e 's#@@RuntimeDir@@#$(runtimedir)#g' \

278N/A+ -e 's#@@DataDir@@#$(datadir)#g' \

278N/A < $$i; \

278N/A else \

278N/A sed -n -e '/@@LoadModule@@/q' \

4695N/A@@ -116,6 +119,19 @@

278N/A cp -p envvars-std $(DESTDIR)$(sbindir)/envvars ; \

278N/A fi ; \

278N/A fi

737N/A+ @if ! grep "{APACHE_USER_ENVVARS}" $(DESTDIR)$(sbindir)/envvars > /dev/null; then \

737N/A+ echo '# If you run apachectl with APACHE_USER_ENVVARS in its environment'\

737N/A+ >> $(DESTDIR)$(sbindir)/envvars ; \

737N/A+ echo '# the specified file will be sourced here. The standard path is'\

737N/A+ >> $(DESTDIR)$(sbindir)/envvars ; \

3158N/A+ echo '# /etc/apache2/2.4/envvars.' >> $(DESTDIR)$(sbindir)/envvars ; \

737N/A+ echo '' >> $(DESTDIR)$(sbindir)/envvars ; \

737N/A+ echo 'if [ "x$${APACHE_USER_ENVVARS}" != "x" -a -f "$${APACHE_USER_ENVVARS}" ]; then'\

737N/A+ >> $(DESTDIR)$(sbindir)/envvars ; \

737N/A+ echo '. "$${APACHE_USER_ENVVARS}"' >> $(DESTDIR)$(sbindir)/envvars ; \

278N/A+ echo 'fi' >> $(DESTDIR)$(sbindir)/envvars ; \

278N/A+ fi

278N/A+ @grep "^#" $(top_builddir)/support/envvars-std > $(DESTDIR)$(sysconfdir)/envvars

278N/A

278N/A # Create a sanitized config_vars.mk

278N/A build/config_vars.out: build/config_vars.mk

4695N/A@@ -202,7 +218,6 @@

278N/A

278N/A install-other:

278N/A @test -d $(DESTDIR)$(logfiledir) || $(MKINSTALLDIRS) $(DESTDIR)$(logfiledir)

278N/A- @test -d $(DESTDIR)$(runtimedir) || $(MKINSTALLDIRS) $(DESTDIR)$(runtimedir)

278N/A @for ext in dll x; do \

278N/A file=apachecore.$$ext; \

278N/A if test -f $$file; then \