1 --- Makefile.in Tue Nov 25 12:24:49 2008 |
1 --- Makefile.in Tue Nov 25 12:24:49 2008 |
2 +++ Makefile.in Thu May 19 08:09:10 2011 |
2 +++ Makefile.in Tue Feb 28 07:08:05 2012 |
3 @@ -49,6 +49,9 @@ |
3 @@ -49,6 +49,9 @@ |
4 -e 's#@@Port@@#$(PORT)#g' \ |
4 -e 's#@@Port@@#$(PORT)#g' \ |
5 -e 's#@@SSLPort@@#$(SSLPORT)#g' \ |
5 -e 's#@@SSLPort@@#$(SSLPORT)#g' \ |
6 -e '/@@LoadModule@@/d' \ |
6 -e '/@@LoadModule@@/d' \ |
7 + -e 's#@@SysconfDir@@#$(sysconfdir)#g' \ |
7 + -e 's#@@SysconfDir@@#$(sysconfdir)#g' \ |
8 + -e 's#@@RuntimeDir@@#$(runtimedir)#g' \ |
8 + -e 's#@@RuntimeDir@@#$(runtimedir)#g' \ |
9 + -e 's#@@DataDir@@#$(datadir)#g' \ |
9 + -e 's#@@DataDir@@#$(datadir)#g' \ |
10 < $$i; \ |
10 < $$i; \ |
11 else \ |
11 else \ |
12 sed -n -e '/@@LoadModule@@/q' \ |
12 sed -n -e '/@@LoadModule@@/q' \ |
13 @@ -87,6 +90,12 @@ |
13 @@ -87,6 +90,19 @@ |
14 cp -p envvars-std $(DESTDIR)$(sbindir)/envvars ; \ |
14 cp -p envvars-std $(DESTDIR)$(sbindir)/envvars ; \ |
15 fi ; \ |
15 fi ; \ |
16 fi |
16 fi |
17 + @if ! grep "$(sysconfdir)/envvars" $(DESTDIR)$(sbindir)/envvars > /dev/null; then \ |
17 + @if ! grep "{APACHE_USER_ENVVARS}" $(DESTDIR)$(sbindir)/envvars > /dev/null; then \ |
18 + echo 'if [ -f $(sysconfdir)/envvars ]; then' >> $(DESTDIR)$(sbindir)/envvars ; \ |
18 + echo '# If you run apachectl with APACHE_USER_ENVVARS in its environment'\ |
19 + echo '. $(sysconfdir)/envvars' >> $(DESTDIR)$(sbindir)/envvars ; \ |
19 + >> $(DESTDIR)$(sbindir)/envvars ; \ |
|
20 + echo '# the specified file will be sourced here. The standard path is'\ |
|
21 + >> $(DESTDIR)$(sbindir)/envvars ; \ |
|
22 + echo '# /etc/apache2/2.2/envvars.' >> $(DESTDIR)$(sbindir)/envvars ; \ |
|
23 + echo '' >> $(DESTDIR)$(sbindir)/envvars ; \ |
|
24 + echo 'if [ "x$${APACHE_USER_ENVVARS}" != "x" -a -f "$${APACHE_USER_ENVVARS}" ]; then'\ |
|
25 + >> $(DESTDIR)$(sbindir)/envvars ; \ |
|
26 + echo '. "$${APACHE_USER_ENVVARS}"' >> $(DESTDIR)$(sbindir)/envvars ; \ |
20 + echo 'fi' >> $(DESTDIR)$(sbindir)/envvars ; \ |
27 + echo 'fi' >> $(DESTDIR)$(sbindir)/envvars ; \ |
21 + fi |
28 + fi |
22 + @grep "^#" $(top_builddir)/support/envvars-std > $(DESTDIR)$(sysconfdir)/envvars |
29 + @grep "^#" $(top_builddir)/support/envvars-std > $(DESTDIR)$(sysconfdir)/envvars |
23 |
30 |
24 # Create a sanitized config_vars.mk |
31 # Create a sanitized config_vars.mk |
25 build/config_vars.out: build/config_vars.mk |
32 build/config_vars.out: build/config_vars.mk |
26 @@ -165,7 +174,6 @@ |
33 @@ -165,7 +181,6 @@ |
27 |
34 |
28 install-other: |
35 install-other: |
29 @test -d $(DESTDIR)$(logfiledir) || $(MKINSTALLDIRS) $(DESTDIR)$(logfiledir) |
36 @test -d $(DESTDIR)$(logfiledir) || $(MKINSTALLDIRS) $(DESTDIR)$(logfiledir) |
30 - @test -d $(DESTDIR)$(runtimedir) || $(MKINSTALLDIRS) $(DESTDIR)$(runtimedir) |
37 - @test -d $(DESTDIR)$(runtimedir) || $(MKINSTALLDIRS) $(DESTDIR)$(runtimedir) |
31 @for ext in dll x; do \ |
38 @for ext in dll x; do \ |