--- Makefile.in Tue Nov 25 12:24:49 2008

+++ Makefile.in Thu May 19 08:09:10 2011

@@ -49,6 +49,9 @@

-e 's#@@Port@@#$(PORT)#g' \

-e 's#@@SSLPort@@#$(SSLPORT)#g' \

-e '/@@LoadModule@@/d' \

+ -e 's#@@SysconfDir@@#$(sysconfdir)#g' \

+ -e 's#@@RuntimeDir@@#$(runtimedir)#g' \

+ -e 's#@@DataDir@@#$(datadir)#g' \

< $$i; \

else \

sed -n -e '/@@LoadModule@@/q' \

@@ -87,6 +90,12 @@

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

fi ; \

fi

+ @if ! grep "$(sysconfdir)/envvars" $(DESTDIR)$(sbindir)/envvars > /dev/null; then \

+ echo 'if [ -f $(sysconfdir)/envvars ]; then' >> $(DESTDIR)$(sbindir)/envvars ; \

+ echo '. $(sysconfdir)/envvars' >> $(DESTDIR)$(sbindir)/envvars ; \

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

+ fi

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

# Create a sanitized config_vars.mk

build/config_vars.out: build/config_vars.mk

@@ -165,7 +174,6 @@

install-other:

@test -d $(DESTDIR)$(logfiledir) || $(MKINSTALLDIRS) $(DESTDIR)$(logfiledir)

- @test -d $(DESTDIR)$(runtimedir) || $(MKINSTALLDIRS) $(DESTDIR)$(runtimedir)

@for ext in dll x; do \

file=apachecore.$$ext; \

if test -f $$file; then \