From: Keith Packard <keithp@neko.keithp.com>
Date: Sat, 9 Sep 2006 22:49:24 +0000 (-0700)
Subject: Merge branch 'jhcloos'
X-Git-Tag: 2.4.0~8
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=766a9b2f61458202be0fbf5745ce1e02ecd95c6e;hp=-c;p=fontconfig.git

Merge branch 'jhcloos'
---

766a9b2f61458202be0fbf5745ce1e02ecd95c6e
diff --combined Makefile.am
index cf90617,a7a6015..1ebb869
--- a/Makefile.am
+++ b/Makefile.am
@@@ -23,7 -23,7 +23,7 @@@
  
  DOCSRC=@DOCSRC@
  SUBDIRS=fontconfig fc-case fc-lang fc-glyphname fc-arch src \
- 	fc-cache fc-cat fc-list fc-match conf.d $(DOCSRC) test
+ 	fc-cache fc-cat fc-list fc-match conf.avail conf.d $(DOCSRC) test
  	 
  EXTRA_DIST = \
          fontconfig.pc.in \
@@@ -85,7 -85,7 +85,7 @@@ $(srcdir)/ChangeLog
  .PHONY: ChangeLog $(srcdir)/ChangeLog
  
  install-data-local:
 -	$(mkinstalldirs) $(DESTDIR)$(configdir)
 +	$(mkinstalldirs) $(DESTDIR)$(configdir) $(DESTDIR)$(fc_cachedir)
  	if [ -f $(DESTDIR)$(configdir)/fonts.conf ]; then \
  	  echo "backing up existing $(DESTDIR)$(configdir)/fonts.conf"; \
  	  mv $(DESTDIR)$(configdir)/fonts.conf $(DESTDIR)$(configdir)/fonts.conf.bak; \
@@@ -97,7 -97,7 +97,7 @@@
  	  echo " $(INSTALL_DATA) fonts.conf $(DESTDIR)$(configdir)/fonts.conf"; \
  	  $(INSTALL_DATA) fonts.conf $(DESTDIR)$(configdir)/fonts.conf; \
  	fi; fi
 -	@(if $(RUN_FC_CACHE_TEST); then \
 +	(if $(RUN_FC_CACHE_TEST); then \
  	    echo " fc-cache/fc-cache -s -f -v"; \
  	    fc-cache/fc-cache -s -f -v; \
  	else \
diff --combined configure.in
index 3226dd0,5a6309d..d8afffb
--- a/configure.in
+++ b/configure.in
@@@ -33,19 -33,16 +33,19 @@@ dnl This is the package version number
  dnl version.  This same version number must appear in fontconfig/fontconfig.h
  dnl Yes, it is a pain to synchronize version numbers.  Unfortunately, it's
  dnl not possible to extract the version number here from fontconfig.h
 -AM_INIT_AUTOMAKE(fontconfig, 2.3.96)
 +AM_INIT_AUTOMAKE(fontconfig, 2.3.97)
  AM_MAINTAINER_MODE
  
  dnl libtool versioning
  
 -LT_CURRENT=1
 -LT_REVISION=4
 +dnl bump revision when fixing bugs
 +dnl bump current and age, reset revision to zero when adding APIs
 +dnl bump current, leave age, reset revision to zero when changing/removing APIS
 +LT_CURRENT=2
 +LT_REVISION=0
  AC_SUBST(LT_CURRENT)
  AC_SUBST(LT_REVISION)
 -LT_AGE=0
 +LT_AGE=1
  
  LT_VERSION_INFO="$LT_CURRENT:$LT_REVISION:$LT_AGE"
  AC_SUBST(LT_VERSION_INFO)
@@@ -563,6 -560,7 +563,7 @@@ fc-case/Makefil
  fc-arch/Makefile
  src/Makefile
  src/fontconfig.def
+ conf.avail/Makefile
  conf.d/Makefile
  fc-cache/Makefile
  fc-cat/Makefile