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-1_5/patches/makefile-out.patch
author Rich Burridge <rich.burridge@oracle.com>
Tue, 07 Oct 2014 14:20:21 -0700
changeset 2140 ba3091d7e9b6
parent 1823 aa5916252876
permissions -rw-r--r--
19775104 Multiple TPNO's not being correctly displayed on Userland gatelist webpage
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
1823
aa5916252876 PSARC/2014/099 APR and APR-util 1.5; EOF APR and APR-util 1.3
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
     1
 
Patch origin: in-house
aa5916252876 PSARC/2014/099 APR and APR-util 1.5; EOF APR and APR-util 1.3
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
     2
 
Patch status: Solaris-specific; not suitable for upstream
aa5916252876 PSARC/2014/099 APR and APR-util 1.5; EOF APR and APR-util 1.3
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
     3
 












aa5916252876
PSARC/2014/099 APR and APR-util 1.5; EOF APR and APR-util 1.3



Petr Sumbera <petr.sumbera@oracle.com>


parents: 

diff
changeset




     4


--- Makefile.in	Thu Nov 20 22:32:58 2008













aa5916252876
PSARC/2014/099 APR and APR-util 1.5; EOF APR and APR-util 1.3



Petr Sumbera <petr.sumbera@oracle.com>


parents: 

diff
changeset




     5


+++ Makefile.in	Thu Nov 10 05:02:25 2011













aa5916252876
PSARC/2014/099 APR and APR-util 1.5; EOF APR and APR-util 1.3



Petr Sumbera <petr.sumbera@oracle.com>


parents: 

diff
changeset




     6


@@ -10,7 +10,7 @@













aa5916252876
PSARC/2014/099 APR and APR-util 1.5; EOF APR and APR-util 1.3



Petr Sumbera <petr.sumbera@oracle.com>


parents: 

diff
changeset




     7


 srcdir = @srcdir@













aa5916252876
PSARC/2014/099 APR and APR-util 1.5; EOF APR and APR-util 1.3



Petr Sumbera <petr.sumbera@oracle.com>


parents: 

diff
changeset




     8


 VPATH = @srcdir@













aa5916252876
PSARC/2014/099 APR and APR-util 1.5; EOF APR and APR-util 1.3



Petr Sumbera <petr.sumbera@oracle.com>


parents: 

diff
changeset




     9


 













aa5916252876
PSARC/2014/099 APR and APR-util 1.5; EOF APR and APR-util 1.3



Petr Sumbera <petr.sumbera@oracle.com>


parents: 

diff
changeset




    10


-INCLUDES = @APRUTIL_PRIV_INCLUDES@ @APR_INCLUDES@ @APRUTIL_INCLUDES@













aa5916252876
PSARC/2014/099 APR and APR-util 1.5; EOF APR and APR-util 1.3



Petr Sumbera <petr.sumbera@oracle.com>


parents: 

diff
changeset




    11


+INCLUDES = -I/usr/include/openldap @APRUTIL_PRIV_INCLUDES@ @APR_INCLUDES@ @APRUTIL_INCLUDES@













aa5916252876
PSARC/2014/099 APR and APR-util 1.5; EOF APR and APR-util 1.3



Petr Sumbera <petr.sumbera@oracle.com>


parents: 

diff
changeset




    12


 APRUTIL_LDFLAGS = @APRUTIL_LDFLAGS@













aa5916252876
PSARC/2014/099 APR and APR-util 1.5; EOF APR and APR-util 1.3



Petr Sumbera <petr.sumbera@oracle.com>


parents: 

diff
changeset




    13


 APRUTIL_LIBS = @APRUTIL_LIBS@













aa5916252876
PSARC/2014/099 APR and APR-util 1.5; EOF APR and APR-util 1.3



Petr Sumbera <petr.sumbera@oracle.com>


parents: 

diff
changeset




    14


 













aa5916252876
PSARC/2014/099 APR and APR-util 1.5; EOF APR and APR-util 1.3



Petr Sumbera <petr.sumbera@oracle.com>


parents: 

diff
changeset




    15


@@ -71,7 +71,10 @@













aa5916252876
PSARC/2014/099 APR and APR-util 1.5; EOF APR and APR-util 1.3



Petr Sumbera <petr.sumbera@oracle.com>


parents: 

diff
changeset




    16


 













aa5916252876
PSARC/2014/099 APR and APR-util 1.5; EOF APR and APR-util 1.3



Petr Sumbera <petr.sumbera@oracle.com>


parents: 

diff
changeset




    17


 # Create apu-config script suitable for the install tree













aa5916252876
PSARC/2014/099 APR and APR-util 1.5; EOF APR and APR-util 1.3



Petr Sumbera <petr.sumbera@oracle.com>


parents: 

diff
changeset




    18


 apu-config.out: $(APU_CONFIG)













aa5916252876
PSARC/2014/099 APR and APR-util 1.5; EOF APR and APR-util 1.3



Petr Sumbera <petr.sumbera@oracle.com>


parents: 

diff
changeset




    19


-	sed 's,^\(location=\).*$$,\1installed,' < $(APU_CONFIG) > $@













aa5916252876
PSARC/2014/099 APR and APR-util 1.5; EOF APR and APR-util 1.3



Petr Sumbera <petr.sumbera@oracle.com>


parents: 

diff
changeset




    20


+	sed -e 's,^\(location=\).*$$,\1installed,' \













aa5916252876
PSARC/2014/099 APR and APR-util 1.5; EOF APR and APR-util 1.3



Petr Sumbera <petr.sumbera@oracle.com>


parents: 

diff
changeset




    21


+	    -e '/^APU_SOURCE_DIR=/s,/.*",/usr/apr-util/1.5",' \













aa5916252876
PSARC/2014/099 APR and APR-util 1.5; EOF APR and APR-util 1.3



Petr Sumbera <petr.sumbera@oracle.com>


parents: 

diff
changeset




    22


+	    -e '/^APU_BUILD_DIR=/s,/.*",/usr/apr-util/1.5",' \













aa5916252876
PSARC/2014/099 APR and APR-util 1.5; EOF APR and APR-util 1.3



Petr Sumbera <petr.sumbera@oracle.com>


parents: 

diff
changeset




    23


+	     < $(APU_CONFIG) > $@













aa5916252876
PSARC/2014/099 APR and APR-util 1.5; EOF APR and APR-util 1.3



Petr Sumbera <petr.sumbera@oracle.com>


parents: 

diff
changeset




    24


 













aa5916252876
PSARC/2014/099 APR and APR-util 1.5; EOF APR and APR-util 1.3



Petr Sumbera <petr.sumbera@oracle.com>


parents: 

diff
changeset




    25


 install: $(TARGETS) install-modules













aa5916252876
PSARC/2014/099 APR and APR-util 1.5; EOF APR and APR-util 1.3



Petr Sumbera <petr.sumbera@oracle.com>


parents: 

diff
changeset




    26


 	$(APR_MKDIR) $(DESTDIR)$(includedir) $(DESTDIR)$(libdir)/pkgconfig \















upstream/oracle/userland-gate