equal
deleted
inserted
replaced
11 + -e 's#@@RuntimeDir@@#$(runtimedir)#g' \ |
11 + -e 's#@@RuntimeDir@@#$(runtimedir)#g' \ |
12 + -e 's#@@DataDir@@#$(datadir)#g' \ |
12 + -e 's#@@DataDir@@#$(datadir)#g' \ |
13 < $$i; \ |
13 < $$i; \ |
14 else \ |
14 else \ |
15 sed -n -e '/@@LoadModule@@/q' \ |
15 sed -n -e '/@@LoadModule@@/q' \ |
16 @@ -96,6 +99,19 @@ |
16 @@ -116,6 +119,19 @@ |
17 cp -p envvars-std $(DESTDIR)$(sbindir)/envvars ; \ |
17 cp -p envvars-std $(DESTDIR)$(sbindir)/envvars ; \ |
18 fi ; \ |
18 fi ; \ |
19 fi |
19 fi |
20 + @if ! grep "{APACHE_USER_ENVVARS}" $(DESTDIR)$(sbindir)/envvars > /dev/null; then \ |
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'\ |
21 + echo '# If you run apachectl with APACHE_USER_ENVVARS in its environment'\ |
31 + fi |
31 + fi |
32 + @grep "^#" $(top_builddir)/support/envvars-std > $(DESTDIR)$(sysconfdir)/envvars |
32 + @grep "^#" $(top_builddir)/support/envvars-std > $(DESTDIR)$(sysconfdir)/envvars |
33 |
33 |
34 # Create a sanitized config_vars.mk |
34 # Create a sanitized config_vars.mk |
35 build/config_vars.out: build/config_vars.mk |
35 build/config_vars.out: build/config_vars.mk |
36 @@ -182,7 +198,6 @@ |
36 @@ -202,7 +218,6 @@ |
37 |
37 |
38 install-other: |
38 install-other: |
39 @test -d $(DESTDIR)$(logfiledir) || $(MKINSTALLDIRS) $(DESTDIR)$(logfiledir) |
39 @test -d $(DESTDIR)$(logfiledir) || $(MKINSTALLDIRS) $(DESTDIR)$(logfiledir) |
40 - @test -d $(DESTDIR)$(runtimedir) || $(MKINSTALLDIRS) $(DESTDIR)$(runtimedir) |
40 - @test -d $(DESTDIR)$(runtimedir) || $(MKINSTALLDIRS) $(DESTDIR)$(runtimedir) |
41 @for ext in dll x; do \ |
41 @for ext in dll x; do \ |