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 .cvsignore Makefile.in
Date Wed, 30 Jun 2004 09:05:19 GMT
jorton      2004/06/30 02:05:19

  Modified:    .        .cvsignore Makefile.in
  Log:
  * Makefile.in (APRUTIL_PCFILE): New target.
  (install): Install pkgconfig .pc file with -N suffix.
  
  Revision  Changes    Path
  1.23      +1 -1      apr-util/.cvsignore
  
  Index: .cvsignore
  ===================================================================
  RCS file: /home/cvs/apr-util/.cvsignore,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -d -w -u -r1.22 -r1.23
  --- .cvsignore	23 Jun 2004 12:07:28 -0000	1.22
  +++ .cvsignore	30 Jun 2004 09:05:19 -0000	1.23
  @@ -36,4 +36,4 @@
   autom4te.cache
   build-outputs.mk
   .make.dirs
  -apr-util.pc
  +apr-util*.pc
  
  
  
  1.92      +9 -3      apr-util/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apr-util/Makefile.in,v
  retrieving revision 1.91
  retrieving revision 1.92
  diff -d -w -u -r1.91 -r1.92
  --- Makefile.in	23 Jun 2004 13:05:02 -0000	1.91
  +++ Makefile.in	30 Jun 2004 09:05:19 -0000	1.92
  @@ -21,6 +21,7 @@
   INSTALL_SUBDIRS = @APR_XML_DIR@
   EXTRA_SOURCE_DIRS = @APR_XML_DIR@
   EXTRA_OS_LINK=@EXTRA_OS_LINK@
  +APRUTIL_PCFILE = apr-util-$(APRUTIL_MAJOR_VERSION).pc
   
   TARGETS = $(TARGET_LIB) aprutil.exp
   
  @@ -30,7 +31,8 @@
   
   CLEAN_SUBDIRS = test
   
  -CLEAN_TARGETS = exports.c export_vars.c aprutil.exp .make.dirs apu-config.out
  +CLEAN_TARGETS = exports.c export_vars.c aprutil.exp .make.dirs apu-config.out \
  +	$(APRUTIL_PCFILE)
   DISTCLEAN_TARGETS = config.cache config.log config.status libtool \
   	include/private/apu_config.h include/private/apu_private.h \
   	include/private/apu_select_dbm.h include/apr_ldap.h include/apu.h \
  @@ -53,7 +55,11 @@
   apu-config.out: apu-config
   	sed 's,^\(location=\).*$$,\1installed,' < apu-config > $@
   
  -install: $(TARGET_LIB) apu-config.out
  +$(APRUTIL_PCFILE): apr-util.pc
  +	@rm -f $@
  +	cp apr-util.pc $@
  +
  +install: $(TARGET_LIB) apu-config.out $(APRUTIL_PCFILE)
   	if [ ! -d $(DESTDIR)$(includedir) ]; then \
   	    $(APR_BUILD_DIR)/mkdir.sh $(DESTDIR)$(includedir); \
   	fi;
  @@ -68,7 +74,7 @@
   	if [ ! -d $(DESTDIR)$(libdir)/pkgconfig ]; then \
   	    $(APR_BUILD_DIR)/mkdir.sh $(DESTDIR)$(libdir)/pkgconfig; \
   	fi;
  -	cp -p apr-util.pc $(DESTDIR)$(libdir)/pkgconfig;
  +	cp -p $(APRUTIL_PCFILE) $(DESTDIR)$(libdir)/pkgconfig
   	list='$(INSTALL_SUBDIRS)'; for i in $$list; do \
   		( cd $$i ; $(MAKE) DESTDIR=$(DESTDIR) install ); \
   	done
  
  
  

Mime
View raw message