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 configure.in Makefile.in
Date Mon, 23 Aug 2004 20:22:19 GMT
jorton      2004/08/23 13:22:18

  Modified:    .        configure.in Makefile.in
  Log:
  * configure.in: Use AC_PROG_INSTALL.
  
  * Makefile.in (install): Simplify; use INSTALL and INSTALL_DATA rather
  than cp; use APR_MKDIR.
  
  Revision  Changes    Path
  1.78      +2 -0      apr-util/configure.in
  
  Index: configure.in
  ===================================================================
  RCS file: /home/cvs/apr-util/configure.in,v
  retrieving revision 1.77
  retrieving revision 1.78
  diff -d -w -u -r1.77 -r1.78
  --- configure.in	10 Aug 2004 03:45:43 -0000	1.77
  +++ configure.in	23 Aug 2004 20:22:18 -0000	1.78
  @@ -37,6 +37,8 @@
   
   AC_CANONICAL_SYSTEM
   
  +AC_PROG_INSTALL
  +
   dnl
   dnl compute the top directory of the build
   dnl note: this is needed for LIBTOOL and exporting the bundled Expat
  
  
  
  1.97      +10 -22    apr-util/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apr-util/Makefile.in,v
  retrieving revision 1.96
  retrieving revision 1.97
  diff -d -w -u -r1.96 -r1.97
  --- Makefile.in	10 Aug 2004 03:45:43 -0000	1.96
  +++ Makefile.in	23 Aug 2004 20:22:18 -0000	1.97
  @@ -20,6 +20,8 @@
   EXTRA_OS_LINK=@EXTRA_OS_LINK@
   APRUTIL_PCFILE = apr-util-$(APRUTIL_MAJOR_VERSION).pc
   APU_CONFIG = apu-$(APRUTIL_MAJOR_VERSION)-config
  +INSTALL = @INSTALL@
  +INSTALL_DATA = @INSTALL_DATA@
   
   TARGETS = $(TARGET_LIB) aprutil.exp
   
  @@ -53,31 +55,17 @@
   	sed 's,^\(location=\).*$$,\1installed,' < $(APU_CONFIG) > $@
   
   install: $(TARGET_LIB) apu-config.out
  -	if [ ! -d $(DESTDIR)$(includedir) ]; then \
  -	    $(APR_MKDIR) $(DESTDIR)$(includedir); \
  -	fi;
  -	cp -p $(top_srcdir)/include/*.h $(DESTDIR)$(includedir)
  -
  -	if [ -n "$(top_blddir)" ]; then \
  -		cp -p $(top_blddir)/include/*.h $(DESTDIR)$(includedir); \
  -	fi;
  -	if [ ! -d $(DESTDIR)$(libdir) ]; then \
  -	    $(APR_MKDIR) $(DESTDIR)$(libdir); \
  -	fi;
  -	if [ ! -d $(DESTDIR)$(libdir)/pkgconfig ]; then \
  -	    $(APR_MKDIR) $(DESTDIR)$(libdir)/pkgconfig; \
  -	fi;
  -	cp -p apr-util.pc $(DESTDIR)$(libdir)/pkgconfig/$(APRUTIL_PCFILE)
  +	$(APR_MKDIR) $(DESTDIR)$(includedir) $(DESTDIR)$(libdir)/pkgconfig \
  +		     $(DESTDIR)$(libdir) $(DESTDIR)$(bindir)
  +	$(INSTALL_DATA) $(top_srcdir)/include/*.h $(DESTDIR)$(includedir)
  +	$(INSTALL_DATA) $(top_blddir)/include/*.h $(DESTDIR)$(includedir)
  +	$(INSTALL_DATA) apr-util.pc $(DESTDIR)$(libdir)/pkgconfig/$(APRUTIL_PCFILE)
   	list='$(INSTALL_SUBDIRS)'; for i in $$list; do \
   		( cd $$i ; $(MAKE) DESTDIR=$(DESTDIR) install ); \
   	done
  -	$(LIBTOOL) --mode=install cp $(TARGET_LIB) $(DESTDIR)$(libdir)
  -	$(LIBTOOL) --mode=install cp aprutil.exp $(DESTDIR)$(libdir)
  -	if [ ! -d $(DESTDIR)$(bindir) ]; then \
  -		$(APR_MKDIR) $(DESTDIR)$(bindir); \
  -	fi;
  -	$(LIBTOOL) --mode=install cp apu-config.out $(DESTDIR)$(bindir)/$(APU_CONFIG)
  -	chmod 755 $(DESTDIR)$(bindir)/$(APU_CONFIG)
  +	$(LIBTOOL) --mode=install $(INSTALL) -m 755 $(TARGET_LIB) $(DESTDIR)$(libdir)
  +	$(INSTALL_DATA) aprutil.exp $(DESTDIR)$(libdir)
  +	$(INSTALL) -m 755 apu-config.out $(DESTDIR)$(bindir)/$(APU_CONFIG)
   
   $(TARGET_LIB): $(OBJECTS)
   	$(LINK) @lib_target@ $(ALL_LIBS) $(EXTRA_OS_LINK)
  
  
  

Mime
View raw message