apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jor...@apache.org
Subject cvs commit: apr Makefile.in
Date Wed, 30 Jun 2004 09:10:42 GMT
jorton      2004/06/30 02:10:42

  Modified:    .        Makefile.in
  Log:
  * Makefile.in (install): Simplify stupid over-engineering.
  
  Revision  Changes    Path
  1.103     +3 -8      apr/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apr/Makefile.in,v
  retrieving revision 1.102
  retrieving revision 1.103
  diff -d -w -u -r1.102 -r1.103
  --- Makefile.in	30 Jun 2004 08:46:10 -0000	1.102
  +++ Makefile.in	30 Jun 2004 09:10:42 -0000	1.103
  @@ -39,8 +39,7 @@
   @INCLUDE_RULES@
   @INCLUDE_OUTPUTS@
   
  -CLEAN_TARGETS = apr-config.out apr.exp exports.c export_vars.c .make.dirs \
  -	$(APR_PCFILE)
  +CLEAN_TARGETS = apr-config.out apr.exp exports.c export_vars.c .make.dirs
   DISTCLEAN_TARGETS = config.cache config.log config.status \
   	include/apr.h include/arch/unix/apr_private.h \
   	libtool apr-config build/apr_rules.mk apr.pc
  @@ -58,11 +57,7 @@
   apr-config.out: apr-config
   	sed 's,^\(location=\).*$$,\1installed,' < apr-config > $@
   
  -$(APR_PCFILE): apr.pc
  -	@rm -f $@
  -	cp apr.pc $@
  -
  -install: $(TARGET_LIB) apr-config.out $(APR_PCFILE)
  +install: $(TARGET_LIB) apr-config.out
   	if [ ! -d $(DESTDIR)$(includedir) ]; then \
   	    $(top_srcdir)/build/mkdir.sh $(DESTDIR)$(includedir); \
   	fi;
  @@ -79,7 +74,7 @@
   	if [ ! -d $(DESTDIR)$(libdir)/pkgconfig ]; then \
   	    $(top_srcdir)/build/mkdir.sh $(DESTDIR)$(libdir)/pkgconfig; \
   	fi;
  -	cp -p $(APR_PCFILE) $(DESTDIR)$(libdir)/pkgconfig
  +	cp -p apr.pc $(DESTDIR)$(libdir)/pkgconfig/$(APR_PCFILE)
   	if [ ! -d $(DESTDIR)$(installbuilddir) ]; then \
   	   	$(top_srcdir)/build/mkdir.sh $(DESTDIR)$(installbuilddir); \
   	fi; 
  
  
  

Mime
View raw message