components/apache2/patches/Makefile.in.patch
author Mike Sullivan <Mike.Sullivan@Oracle.COM>
Wed, 29 Aug 2012 11:05:56 -0700
changeset 957 255465c5756f
parent 716 2d2eb53223b2
permissions -rw-r--r--
Close of build 04.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
278
77b380ba9d84 7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
     1
--- Makefile.in	Tue Nov 25 12:24:49 2008
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
     2
+++ Makefile.in	Tue Feb 28 07:08:05 2012
278
77b380ba9d84 7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
     3
@@ -49,6 +49,9 @@
77b380ba9d84 7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
     4
 	    				-e 's#@@[email protected]@#$(PORT)#g' \
77b380ba9d84 7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
     5
 	    				-e 's#@@[email protected]@#$(SSLPORT)#g' \
77b380ba9d84 7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
     6
 	    				-e '/@@[email protected]@/d' \
77b380ba9d84 7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
     7
+	    				-e 's#@@[email protected]@#$(sysconfdir)#g' \
77b380ba9d84 7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
     8
+	    				-e 's#@@[email protected]@#$(runtimedir)#g' \
77b380ba9d84 7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
     9
+	    				-e 's#@@[email protected]@#$(datadir)#g' \
77b380ba9d84 7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    10
 	    				< $$i; \
77b380ba9d84 7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    11
 	    		else \
77b380ba9d84 7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    12
 	    			sed -n -e '/@@[email protected]@/q' \
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
    13
@@ -87,6 +90,19 @@
278
77b380ba9d84 7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    14
 	        cp -p envvars-std $(DESTDIR)$(sbindir)/envvars ; \
77b380ba9d84 7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    15
 	    fi ; \
77b380ba9d84 7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    16
 	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
    17
+	@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
    18
+	    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
    19
+		>> $(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
    20
+	    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
    21
+		>> $(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
    22
+	    echo '# /etc/apache2/2.2/envvars.' >> $(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 '' >> $(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
    24
+	    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
    25
+		>> $(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
    26
+	    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
    27
+	    echo 'fi' >> $(DESTDIR)$(sbindir)/envvars ; \
77b380ba9d84 7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    28
+	fi
77b380ba9d84 7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    29
+	@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
    30
 
77b380ba9d84 7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    31
 # Create a sanitized config_vars.mk
77b380ba9d84 7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    32
 build/config_vars.out: build/config_vars.mk
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
    33
@@ -165,7 +181,6 @@
278
77b380ba9d84 7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    34
 
77b380ba9d84 7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    35
 install-other:
77b380ba9d84 7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    36
 	@test -d $(DESTDIR)$(logfiledir) || $(MKINSTALLDIRS) $(DESTDIR)$(logfiledir)
77b380ba9d84 7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    37
-	@test -d $(DESTDIR)$(runtimedir) || $(MKINSTALLDIRS) $(DESTDIR)$(runtimedir)
77b380ba9d84 7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    38
 	@for ext in dll x; do \
77b380ba9d84 7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    39
 		file=apachecore.$$ext; \
77b380ba9d84 7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    40
 		if test -f $$file; then \