apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jor...@apache.org
Subject cvs commit: apr-util/build apu-conf.m4
Date Wed, 23 Jun 2004 11:58:02 GMT
jorton      2004/06/23 04:58:02

  Modified:    .        Makefile.in
               build    apu-conf.m4
  Log:
  * build/apu-conf.m4: Don't export APR_SOURCE_DIR.
  
  * Makefile.in (install, exports.c, export_vars.h): Use APR_BUILD_DIR
  (APR's installbuilddir); pick up the awk scripts and mkdir.sh from
  there.
  
  Revision  Changes    Path
  1.89      +7 -6      apr-util/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apr-util/Makefile.in,v
  retrieving revision 1.88
  retrieving revision 1.89
  diff -d -w -u -r1.88 -r1.89
  --- Makefile.in	14 Jun 2004 15:43:40 -0000	1.88
  +++ Makefile.in	23 Jun 2004 11:58:02 -0000	1.89
  @@ -13,6 +13,7 @@
   INCLUDES = @APRUTIL_PRIV_INCLUDES@ @APR_INCLUDES@ @APRUTIL_INCLUDES@
   APRUTIL_LDFLAGS = @APRUTIL_LDFLAGS@
   APRUTIL_LIBS = @APRUTIL_LIBS@
  +APR_BUILD_DIR = @APR_BUILD_DIR@
   
   TARGET_LIB = lib@APRUTIL_LIBNAME@.la
   INSTALL_SUBDIRS = @APR_XML_DIR@
  @@ -52,7 +53,7 @@
   
   install: $(TARGET_LIB) apu-config.out
   	if [ ! -d $(DESTDIR)$(includedir) ]; then \
  -	    @APR_SOURCE_DIR@/build/mkdir.sh $(DESTDIR)$(includedir); \
  +	    $(APR_BUILD_DIR)/mkdir.sh $(DESTDIR)$(includedir); \
   	fi;
   	cp -p $(top_srcdir)/include/*.h $(DESTDIR)$(includedir)
   
  @@ -60,10 +61,10 @@
   		cp -p $(top_blddir)/include/*.h $(DESTDIR)$(includedir); \
   	fi;
   	if [ ! -d $(DESTDIR)$(libdir) ]; then \
  -	    @APR_SOURCE_DIR@/build/mkdir.sh $(DESTDIR)$(libdir); \
  +	    $(APR_BUILD_DIR)/mkdir.sh $(DESTDIR)$(libdir); \
   	fi;
   	if [ ! -d $(DESTDIR)$(libdir)/pkgconfig ]; then \
  -	    @APR_SOURCE_DIR@/build/mkdir.sh $(DESTDIR)$(libdir)/pkgconfig; \
  +	    $(APR_BUILD_DIR)/mkdir.sh $(DESTDIR)$(libdir)/pkgconfig; \
   	fi;
   	cp -p apr-util.pc $(DESTDIR)$(libdir)/pkgconfig;
   	list='$(INSTALL_SUBDIRS)'; for i in $$list; do \
  @@ -72,7 +73,7 @@
   	$(LIBTOOL) --mode=install cp $(TARGET_LIB) $(DESTDIR)$(libdir)
   	$(LIBTOOL) --mode=install cp aprutil.exp $(DESTDIR)$(libdir)
   	if [ ! -d $(DESTDIR)$(bindir) ]; then \
  -		@APR_SOURCE_DIR@/build/mkdir.sh $(DESTDIR)$(bindir); \
  +		$(APR_BUILD_DIR)/mkdir.sh $(DESTDIR)$(bindir); \
   	fi;
   	$(LIBTOOL) --mode=install cp apu-config.out $(DESTDIR)$(bindir)/apu-config
   	chmod 755 $(DESTDIR)$(bindir)/apu-config
  @@ -81,10 +82,10 @@
   	$(LINK) @lib_target@ $(ALL_LIBS) $(EXTRA_OS_LINK)
   
   exports.c: $(HEADERS)
  -	$(AWK) -f @APR_SOURCE_DIR@/build/make_exports.awk $(HEADERS) > $@
  +	$(AWK) -f $(APR_BUILD_DIR)/make_exports.awk $(HEADERS) > $@
   
   export_vars.h: $(HEADERS)
  -	$(AWK) -f @APR_SOURCE_DIR@/build/make_var_export.awk $(HEADERS) > $@
  +	$(AWK) -f $(APR_BUILD_DIR)/make_var_export.awk $(HEADERS) > $@
   
   aprutil.exp: exports.c export_vars.h
   	@echo "#! libaprutil.so" > $@
  
  
  
  1.59      +0 -4      apr-util/build/apu-conf.m4
  
  Index: apu-conf.m4
  ===================================================================
  RCS file: /home/cvs/apr-util/build/apu-conf.m4,v
  retrieving revision 1.58
  retrieving revision 1.59
  diff -d -w -u -r1.58 -r1.59
  --- apu-conf.m4	13 Mar 2004 01:16:24 -0000	1.58
  +++ apu-conf.m4	23 Jun 2004 11:58:02 -0000	1.59
  @@ -26,11 +26,7 @@
   
     AC_SUBST(APR_INCLUDES)
     AC_SUBST(APR_LIBS)
  -
  -  dnl ### would be nice to obsolete these
  -  APR_SOURCE_DIR="`$apr_config --srcdir`"
     AC_SUBST(APR_BUILD_DIR)
  -  AC_SUBST(APR_SOURCE_DIR)
   ])
   
   
  
  
  

Mime
View raw message