Mercurial Mercurial > upstream > oracle > userland-gate / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
components/apache2/patches/Makefile.in.patch
author Tomas Dzik <Tomas.Dzik@oracle.com>
Tue, 27 Mar 2012 06:39:39 -0700
branchs11-sru
changeset 2259 fb408bde6228
parent 278 77b380ba9d84
permissions -rw-r--r--
7143740 svc:/system/install/server:default can conflict with svc:/network/http:apache22
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
2259
fb408bde6228 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#@@Port@@#$(PORT)#g' \
77b380ba9d84 7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
     5
 
 	    				-e 's#@@SSLPort@@#$(SSLPORT)#g' \
77b380ba9d84 7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
     6
 
 	    				-e '/@@LoadModule@@/d' \
77b380ba9d84 7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
     7
 
+	    				-e 's#@@SysconfDir@@#$(sysconfdir)#g' \
77b380ba9d84 7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
     8
 
+	    				-e 's#@@RuntimeDir@@#$(runtimedir)#g' \
77b380ba9d84 7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
     9
 
+	    				-e 's#@@DataDir@@#$(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 '/@@LoadModule@@/q' \
2259
fb408bde6228 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
2259
fb408bde6228 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 \
fb408bde6228 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'\
fb408bde6228 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 ; \
fb408bde6228 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'\
fb408bde6228 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 ; \
fb408bde6228 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 ; \
fb408bde6228 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 ; \
fb408bde6228 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'\
fb408bde6228 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 ; \
fb408bde6228 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
2259
fb408bde6228 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 \
upstream/oracle/userland-gate