[Fontconfig] fontconfig: Branch 'master' - 2 commits

[Tor Lillqvist]

 fontconfig-zip.in |    8 ++------
 src/Makefile.am   |    2 +-
 2 files changed, 3 insertions(+), 7 deletions(-)

New commits:
commit 91a73751dcd4fd2d2e4e8bcb98af53098c721224
Author: Tor Lillqvist <tml at iki.fi>
Date:   Wed Nov 18 21:56:16 2009 +0200

    Improve zip "distribution"
    
    Don't put entries for directories in the zip file. Fetch manpages from
    correct place.

diff --git a/fontconfig-zip.in b/fontconfig-zip.in
index ba6fd4a..1ca222c 100755
--- a/fontconfig-zip.in
+++ b/fontconfig-zip.in
@@ -15,7 +15,7 @@ etc/fonts/fonts.conf
 EOF
 
 rm -f $DEVZIP
-zip -r $DEVZIP -@ <<EOF
+zip -r -D $DEVZIP -@ <<EOF
 etc/fonts/fonts.dtd
 include/fontconfig
 lib/libfontconfig.dll.a
@@ -24,10 +24,6 @@ lib/fontconfig.def
 lib/pkgconfig/fontconfig.pc
 bin/fc-list.exe
 bin/fc-cache.exe
-man/man1/fc-cache.1
-man/man1/fc-list.1
-man/man5/fonts-conf.5
+share/man
 share/doc/fontconfig
 EOF
-
-zip $DEVZIP man/man3/Fc*.3
commit bb8fdae8ad6f0a857569b3e09cf21f1af6b4a41b
Author: Tor Lillqvist <tml at iki.fi>
Date:   Wed Nov 18 21:54:39 2009 +0200

    Use correct autoconf variable
    
    Use LIBT_CURRENT_MINUS_AGE instead of the undefined
    lt_current_minus_age for the name of the DLL when generating the MS
    style import library.

diff --git a/src/Makefile.am b/src/Makefile.am
index 8b6379d..406e85e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -52,7 +52,7 @@ if MS_LIB_AVAILABLE
 noinst_DATA = fontconfig.lib
 
 fontconfig.lib : libfontconfig.la
-	lib -name:libfontconfig-$(lt_current_minus_age).dll -def:fontconfig.def -out:$@
+	lib -name:libfontconfig- at LIBT_CURRENT_MINUS_AGE@.dll -def:fontconfig.def -out:$@
 
 install-ms-import-lib:
 	$(INSTALL) fontconfig.lib $(DESTDIR)$(libdir)