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/apr-util/patches/makefile-out.patch
author Petr Sumbera <petr.sumbera@oracle.com>
Tue, 06 Nov 2012 13:28:59 -0800
changeset 1040 a4dc3ecab65b
parent 203 887f23af6934
permissions -rw-r--r--
PSARC 2012/327 Apache and APR-Util Using OpenLDAP 15537812 SUNBT6798092 APR-Util should use OpenLDAP instead of native Solaris LDAP 15536292 SUNBT6795397 apache libldap crash
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
1040
a4dc3ecab65b PSARC 2012/327 Apache and APR-Util Using OpenLDAP
Petr Sumbera <petr.sumbera@oracle.com>
parents: 203
diff changeset 
     1
 
--- Makefile.in	Thu Nov 20 22:32:58 2008
a4dc3ecab65b PSARC 2012/327 Apache and APR-Util Using OpenLDAP
Petr Sumbera <petr.sumbera@oracle.com>
parents: 203
diff changeset 
     2
 
+++ Makefile.in	Thu Nov 10 05:02:25 2011
a4dc3ecab65b PSARC 2012/327 Apache and APR-Util Using OpenLDAP
Petr Sumbera <petr.sumbera@oracle.com>
parents: 203
diff changeset 
     3
 
@@ -10,7 +10,7 @@
a4dc3ecab65b PSARC 2012/327 Apache and APR-Util Using OpenLDAP
Petr Sumbera <petr.sumbera@oracle.com>
parents: 203
diff changeset 
     4
 
 srcdir = @srcdir@
a4dc3ecab65b PSARC 2012/327 Apache and APR-Util Using OpenLDAP
Petr Sumbera <petr.sumbera@oracle.com>
parents: 203
diff changeset 
     5
 
 VPATH = @srcdir@
a4dc3ecab65b PSARC 2012/327 Apache and APR-Util Using OpenLDAP
Petr Sumbera <petr.sumbera@oracle.com>
parents: 203
diff changeset 
     6
a4dc3ecab65b PSARC 2012/327 Apache and APR-Util Using OpenLDAP
Petr Sumbera <petr.sumbera@oracle.com>
parents: 203
diff changeset 
     7
 
-INCLUDES = @APRUTIL_PRIV_INCLUDES@ @APR_INCLUDES@ @APRUTIL_INCLUDES@
a4dc3ecab65b PSARC 2012/327 Apache and APR-Util Using OpenLDAP
Petr Sumbera <petr.sumbera@oracle.com>
parents: 203
diff changeset 
     8
 
+INCLUDES = -I/usr/include/openldap @APRUTIL_PRIV_INCLUDES@ @APR_INCLUDES@ @APRUTIL_INCLUDES@
a4dc3ecab65b PSARC 2012/327 Apache and APR-Util Using OpenLDAP
Petr Sumbera <petr.sumbera@oracle.com>
parents: 203
diff changeset 
     9
 
 APRUTIL_LDFLAGS = @APRUTIL_LDFLAGS@
a4dc3ecab65b PSARC 2012/327 Apache and APR-Util Using OpenLDAP
Petr Sumbera <petr.sumbera@oracle.com>
parents: 203
diff changeset 
    10
 
 APRUTIL_LIBS = @APRUTIL_LIBS@
a4dc3ecab65b PSARC 2012/327 Apache and APR-Util Using OpenLDAP
Petr Sumbera <petr.sumbera@oracle.com>
parents: 203
diff changeset 
    11
203
887f23af6934 7035055 move apr and apr-util to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    12
 
@@ -71,7 +71,10 @@
887f23af6934 7035055 move apr and apr-util to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    13
887f23af6934 7035055 move apr and apr-util to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    14
 
 # Create apu-config script suitable for the install tree
887f23af6934 7035055 move apr and apr-util to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    15
 
 apu-config.out: $(APU_CONFIG)
887f23af6934 7035055 move apr and apr-util to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    16
 
-	sed 's,^\(location=\).*$$,\1installed,' < $(APU_CONFIG) > $@
887f23af6934 7035055 move apr and apr-util to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    17
 
+	sed -e 's,^\(location=\).*$$,\1installed,' \
887f23af6934 7035055 move apr and apr-util to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    18
 
+	    -e '/^APU_SOURCE_DIR=/s,/.*",/usr/apr-util/1.3",' \
887f23af6934 7035055 move apr and apr-util to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    19
 
+	    -e '/^APU_BUILD_DIR=/s,/.*",/usr/apr-util/1.3",' \
887f23af6934 7035055 move apr and apr-util to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    20
 
+	     < $(APU_CONFIG) > $@
887f23af6934 7035055 move apr and apr-util to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    21
887f23af6934 7035055 move apr and apr-util to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    22
 
 install: $(TARGETS) install-modules
887f23af6934 7035055 move apr and apr-util to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    23
 
 	$(APR_MKDIR) $(DESTDIR)$(includedir) $(DESTDIR)$(libdir)/pkgconfig \
upstream/oracle/userland-gate