1 Patch origin: in-house

     2 Patch status: Solaris-specific; not suitable for upstream

     3 

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

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

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

     7  srcdir = @srcdir@

     8  VPATH = @srcdir@

     9  

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

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

    12  APRUTIL_LDFLAGS = @APRUTIL_LDFLAGS@

    13  APRUTIL_LIBS = @APRUTIL_LIBS@

    14  

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

    16  

    17  # Create apu-config script suitable for the install tree

    18  apu-config.out: $(APU_CONFIG)

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

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

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

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

    23 +	     < $(APU_CONFIG) > $@

    24  

    25  install: $(TARGETS) install-modules

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