author | Petr Sumbera <petr.sumbera@oracle.com> |
Thu, 11 Sep 2014 12:35:18 -0700 | |
changeset 2079 | 46ce7840065c |
parent 716 | components/apache2/patches/Makefile.in.patch@2d2eb53223b2 |
child 4697 | 2be298b79293 |
permissions | -rw-r--r-- |
2079
46ce7840065c
PSARC/2014/253 Apache 2.4 integration; EOF Apache 2.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
716
diff
changeset
|
1 |
Patch origin: in-house |
46ce7840065c
PSARC/2014/253 Apache 2.4 integration; EOF Apache 2.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
716
diff
changeset
|
2 |
Patch status: Solaris-specific; not suitable for upstream |
46ce7840065c
PSARC/2014/253 Apache 2.4 integration; EOF Apache 2.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
716
diff
changeset
|
3 |
|
46ce7840065c
PSARC/2014/253 Apache 2.4 integration; EOF Apache 2.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
716
diff
changeset
|
4 |
--- Makefile.in |
46ce7840065c
PSARC/2014/253 Apache 2.4 integration; EOF Apache 2.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
716
diff
changeset
|
5 |
+++ Makefile.in |
46ce7840065c
PSARC/2014/253 Apache 2.4 integration; EOF Apache 2.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
716
diff
changeset
|
6 |
@@ -50,6 +50,9 @@ |
278
77b380ba9d84
7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
7 |
-e 's#@@Port@@#$(PORT)#g' \ |
77b380ba9d84
7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
8 |
-e 's#@@SSLPort@@#$(SSLPORT)#g' \ |
77b380ba9d84
7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
9 |
-e '/@@LoadModule@@/d' \ |
77b380ba9d84
7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
10 |
+ -e 's#@@SysconfDir@@#$(sysconfdir)#g' \ |
77b380ba9d84
7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
11 |
+ -e 's#@@RuntimeDir@@#$(runtimedir)#g' \ |
77b380ba9d84
7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
12 |
+ -e 's#@@DataDir@@#$(datadir)#g' \ |
77b380ba9d84
7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
13 |
< $$i; \ |
77b380ba9d84
7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
14 |
else \ |
77b380ba9d84
7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
15 |
sed -n -e '/@@LoadModule@@/q' \ |
2079
46ce7840065c
PSARC/2014/253 Apache 2.4 integration; EOF Apache 2.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
716
diff
changeset
|
16 |
@@ -96,6 +99,19 @@ |
278
77b380ba9d84
7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
17 |
cp -p envvars-std $(DESTDIR)$(sbindir)/envvars ; \ |
77b380ba9d84
7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
18 |
fi ; \ |
77b380ba9d84
7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
19 |
fi |
716
2d2eb53223b2
7143740 svc:/system/install/server:default can conflict with svc:/network/http:apache22
Tomas Dzik <Tomas.Dzik@oracle.com>
parents:
278
diff
changeset
|
20 |
+ @if ! grep "{APACHE_USER_ENVVARS}" $(DESTDIR)$(sbindir)/envvars > /dev/null; then \ |
2d2eb53223b2
7143740 svc:/system/install/server:default can conflict with svc:/network/http:apache22
Tomas Dzik <Tomas.Dzik@oracle.com>
parents:
278
diff
changeset
|
21 |
+ echo '# If you run apachectl with APACHE_USER_ENVVARS in its environment'\ |
2d2eb53223b2
7143740 svc:/system/install/server:default can conflict with svc:/network/http:apache22
Tomas Dzik <Tomas.Dzik@oracle.com>
parents:
278
diff
changeset
|
22 |
+ >> $(DESTDIR)$(sbindir)/envvars ; \ |
2d2eb53223b2
7143740 svc:/system/install/server:default can conflict with svc:/network/http:apache22
Tomas Dzik <Tomas.Dzik@oracle.com>
parents:
278
diff
changeset
|
23 |
+ echo '# the specified file will be sourced here. The standard path is'\ |
2d2eb53223b2
7143740 svc:/system/install/server:default can conflict with svc:/network/http:apache22
Tomas Dzik <Tomas.Dzik@oracle.com>
parents:
278
diff
changeset
|
24 |
+ >> $(DESTDIR)$(sbindir)/envvars ; \ |
2079
46ce7840065c
PSARC/2014/253 Apache 2.4 integration; EOF Apache 2.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
716
diff
changeset
|
25 |
+ echo '# /etc/apache2/2.4/envvars.' >> $(DESTDIR)$(sbindir)/envvars ; \ |
716
2d2eb53223b2
7143740 svc:/system/install/server:default can conflict with svc:/network/http:apache22
Tomas Dzik <Tomas.Dzik@oracle.com>
parents:
278
diff
changeset
|
26 |
+ echo '' >> $(DESTDIR)$(sbindir)/envvars ; \ |
2d2eb53223b2
7143740 svc:/system/install/server:default can conflict with svc:/network/http:apache22
Tomas Dzik <Tomas.Dzik@oracle.com>
parents:
278
diff
changeset
|
27 |
+ echo 'if [ "x$${APACHE_USER_ENVVARS}" != "x" -a -f "$${APACHE_USER_ENVVARS}" ]; then'\ |
2d2eb53223b2
7143740 svc:/system/install/server:default can conflict with svc:/network/http:apache22
Tomas Dzik <Tomas.Dzik@oracle.com>
parents:
278
diff
changeset
|
28 |
+ >> $(DESTDIR)$(sbindir)/envvars ; \ |
2d2eb53223b2
7143740 svc:/system/install/server:default can conflict with svc:/network/http:apache22
Tomas Dzik <Tomas.Dzik@oracle.com>
parents:
278
diff
changeset
|
29 |
+ echo '. "$${APACHE_USER_ENVVARS}"' >> $(DESTDIR)$(sbindir)/envvars ; \ |
278
77b380ba9d84
7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
30 |
+ echo 'fi' >> $(DESTDIR)$(sbindir)/envvars ; \ |
77b380ba9d84
7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
31 |
+ fi |
77b380ba9d84
7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
32 |
+ @grep "^#" $(top_builddir)/support/envvars-std > $(DESTDIR)$(sysconfdir)/envvars |
77b380ba9d84
7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
33 |
|
77b380ba9d84
7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
34 |
# Create a sanitized config_vars.mk |
77b380ba9d84
7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
35 |
build/config_vars.out: build/config_vars.mk |
2079
46ce7840065c
PSARC/2014/253 Apache 2.4 integration; EOF Apache 2.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
716
diff
changeset
|
36 |
@@ -182,7 +198,6 @@ |
278
77b380ba9d84
7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
37 |
|
77b380ba9d84
7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
38 |
install-other: |
77b380ba9d84
7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
39 |
@test -d $(DESTDIR)$(logfiledir) || $(MKINSTALLDIRS) $(DESTDIR)$(logfiledir) |
77b380ba9d84
7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
40 |
- @test -d $(DESTDIR)$(runtimedir) || $(MKINSTALLDIRS) $(DESTDIR)$(runtimedir) |
77b380ba9d84
7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
41 |
@for ext in dll x; do \ |
77b380ba9d84
7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
42 |
file=apachecore.$$ext; \ |
77b380ba9d84
7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
43 |
if test -f $$file; then \ |