|
1 Patch origin: in-house |
|
2 Patch status: Solaris-specific; not suitable for upstream |
|
3 |
|
4 --- Makefile.in |
|
5 +++ Makefile.in |
|
6 @@ -50,6 +50,9 @@ |
|
7 -e 's#@@Port@@#$(PORT)#g' \ |
|
8 -e 's#@@SSLPort@@#$(SSLPORT)#g' \ |
|
9 -e '/@@LoadModule@@/d' \ |
|
10 + -e 's#@@SysconfDir@@#$(sysconfdir)#g' \ |
|
11 + -e 's#@@RuntimeDir@@#$(runtimedir)#g' \ |
|
12 + -e 's#@@DataDir@@#$(datadir)#g' \ |
|
13 < $$i; \ |
|
14 else \ |
|
15 sed -n -e '/@@LoadModule@@/q' \ |
|
16 @@ -96,6 +99,19 @@ |
|
17 cp -p envvars-std $(DESTDIR)$(sbindir)/envvars ; \ |
|
18 fi ; \ |
|
19 fi |
|
20 + @if ! grep "{APACHE_USER_ENVVARS}" $(DESTDIR)$(sbindir)/envvars > /dev/null; then \ |
|
21 + echo '# If you run apachectl with APACHE_USER_ENVVARS in its environment'\ |
|
22 + >> $(DESTDIR)$(sbindir)/envvars ; \ |
|
23 + echo '# the specified file will be sourced here. The standard path is'\ |
|
24 + >> $(DESTDIR)$(sbindir)/envvars ; \ |
|
25 + echo '# /etc/apache2/2.4/envvars.' >> $(DESTDIR)$(sbindir)/envvars ; \ |
|
26 + echo '' >> $(DESTDIR)$(sbindir)/envvars ; \ |
|
27 + echo 'if [ "x$${APACHE_USER_ENVVARS}" != "x" -a -f "$${APACHE_USER_ENVVARS}" ]; then'\ |
|
28 + >> $(DESTDIR)$(sbindir)/envvars ; \ |
|
29 + echo '. "$${APACHE_USER_ENVVARS}"' >> $(DESTDIR)$(sbindir)/envvars ; \ |
|
30 + echo 'fi' >> $(DESTDIR)$(sbindir)/envvars ; \ |
|
31 + fi |
|
32 + @grep "^#" $(top_builddir)/support/envvars-std > $(DESTDIR)$(sysconfdir)/envvars |
|
33 |
|
34 # Create a sanitized config_vars.mk |
|
35 build/config_vars.out: build/config_vars.mk |
|
36 @@ -182,7 +198,6 @@ |
|
37 |
|
38 install-other: |
|
39 @test -d $(DESTDIR)$(logfiledir) || $(MKINSTALLDIRS) $(DESTDIR)$(logfiledir) |
|
40 - @test -d $(DESTDIR)$(runtimedir) || $(MKINSTALLDIRS) $(DESTDIR)$(runtimedir) |
|
41 @for ext in dll x; do \ |
|
42 file=apachecore.$$ext; \ |
|
43 if test -f $$file; then \ |