apr-commits mailing list archives

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

  Modified:    .        .cvsignore Makefile.in
  Log:
  * Makefile.in (APR_PCFILE): New target.
  (install): Install pkgconfig .pc file with -N suffix.
  
  Revision  Changes    Path
  1.23      +1 -1      apr/.cvsignore
  
  Index: .cvsignore
  ===================================================================
  RCS file: /home/cvs/apr/.cvsignore,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -d -w -u -r1.22 -r1.23
  --- .cvsignore	29 May 2004 23:16:38 -0000	1.22
  +++ .cvsignore	30 Jun 2004 08:46:10 -0000	1.23
  @@ -38,4 +38,4 @@
   *.bbg
   *.da
   coverage
  -apr.pc
  +apr*.pc
  
  
  
  1.102     +9 -3      apr/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apr/Makefile.in,v
  retrieving revision 1.101
  retrieving revision 1.102
  diff -d -w -u -r1.101 -r1.102
  --- Makefile.in	23 Jun 2004 11:45:41 -0000	1.101
  +++ Makefile.in	30 Jun 2004 08:46:10 -0000	1.102
  @@ -27,6 +27,7 @@
   INSTALL_SUBDIRS=@INSTALL_SUBDIRS@
   
   TARGET_LIB = lib@APR_LIBNAME@.la
  +APR_PCFILE = apr-$(APR_MAJOR_VERSION).pc
   
   #
   # Rules for building specific targets, starting with 'all' for
  @@ -38,7 +39,8 @@
   @INCLUDE_RULES@
   @INCLUDE_OUTPUTS@
   
  -CLEAN_TARGETS = apr-config.out apr.exp exports.c export_vars.c .make.dirs
  +CLEAN_TARGETS = apr-config.out apr.exp exports.c export_vars.c .make.dirs \
  +	$(APR_PCFILE)
   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
  @@ -56,7 +58,11 @@
   apr-config.out: apr-config
   	sed 's,^\(location=\).*$$,\1installed,' < apr-config > $@
   
  -install: $(TARGET_LIB) apr-config.out
  +$(APR_PCFILE): apr.pc
  +	@rm -f $@
  +	cp apr.pc $@
  +
  +install: $(TARGET_LIB) apr-config.out $(APR_PCFILE)
   	if [ ! -d $(DESTDIR)$(includedir) ]; then \
   	    $(top_srcdir)/build/mkdir.sh $(DESTDIR)$(includedir); \
   	fi;
  @@ -73,7 +79,7 @@
   	if [ ! -d $(DESTDIR)$(libdir)/pkgconfig ]; then \
   	    $(top_srcdir)/build/mkdir.sh $(DESTDIR)$(libdir)/pkgconfig; \
   	fi;
  -	cp -p apr.pc  $(DESTDIR)$(libdir)/pkgconfig;
  +	cp -p $(APR_PCFILE) $(DESTDIR)$(libdir)/pkgconfig
   	if [ ! -d $(DESTDIR)$(installbuilddir) ]; then \
   	   	$(top_srcdir)/build/mkdir.sh $(DESTDIR)$(installbuilddir); \
   	fi; 
  
  
  

Mime
View raw message