From: Tor Lillqvist <tml@iki.fi>
Date: Fri, 13 Jun 2003 22:43:28 +0000 (+0000)
Subject: Add share/doc directory. Add Fc*.3 man pages.
X-Git-Tag: fc-2_2_91~21
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=ee1d81259ec5b0b91cf19ea72abec29f5561217b;p=fontconfig.git

Add share/doc directory. Add Fc*.3 man pages.
Set FC_DEFAULT_FONTS on Win32 to the WINDOWSFONTDIR token.
Move the LIBRARY and VERSION lines to the end, not to confuse libtool,
    which expects the EXPORTS line to be the first. Add FcConfigEnableHome.
---

diff --git a/ChangeLog b/ChangeLog
index f61f6c6..354eb04 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2003-06-13  Tor Lillqvist  <tml@iki.fi>
+
+	* fontconfig-zip.in (DEVZIP): Add share/doc directory. Add Fc*.3
+	man pages.
+
+	* configure.in: Set FC_DEFAULT_FONTS on Win32 to the
+	WINDOWSFONTDIR token.
+
+	* src/fontconfig.def.in: Move the LIBRARY and VERSION lines to the
+	end, not to confuse libtool, which expects the EXPORTS line to be
+	the first. Add FcConfigEnableHome.
+
 2003-06-09  Keith Packard <keithp@keithp.com>
 
 	* Tag version 2.2.90
diff --git a/configure.in b/configure.in
index 3bc3e7e..76e8d44 100644
--- a/configure.in
+++ b/configure.in
@@ -225,9 +225,15 @@ AC_ARG_WITH(default-fonts,     [  --with-default-fonts=DIR      Use fonts from D
 
 case "$default_fonts" in
 yes)
-	FC_DEFAULT_FONTS="/usr/share/fonts"
-	AC_DEFINE_UNQUOTED(FC_DEFAULT_FONTS, "/usr/share/fonts", 
-			   [System font directory])
+	if test "$os_win32" = "yes"; then
+		FC_DEFAULT_FONTS="WINDOWSFONTDIR"
+		AC_DEFINE_UNQUOTED(FC_DEFAULT_FONTS, "WINDOWSFONTDIR", 
+				   [Windows font directory])
+	else
+		FC_DEFAULT_FONTS="/usr/share/fonts"
+		AC_DEFINE_UNQUOTED(FC_DEFAULT_FONTS, "/usr/share/fonts", 
+				   [System font directory])
+	fi
 	;;
 *)
 	FC_DEFAULT_FONTS="$default_fonts"
diff --git a/fontconfig-zip.in b/fontconfig-zip.in
index d778c4b..6f9c436 100755
--- a/fontconfig-zip.in
+++ b/fontconfig-zip.in
@@ -26,5 +26,7 @@ bin/fc-list.exe
 bin/fc-cache.exe
 man/man1/fc-cache.1
 man/man1/fc-list.1
-man/man3/fontconfig.3
+man/man3/Fc*.3
+man/man5/fonts-conf.5
+share/doc/fontconfig
 EOF
diff --git a/src/fontconfig.def.in b/src/fontconfig.def.in
index cd937f3..bbb07a6 100755
--- a/src/fontconfig.def.in
+++ b/src/fontconfig.def.in
@@ -1,5 +1,3 @@
-LIBRARY fontconfig
-VERSION @LT_CURRENT@.@LT_REVISION@
 EXPORTS
 	FcAtomicCreate
 	FcAtomicDeleteNew
@@ -34,6 +32,7 @@ EXPORTS
 	FcConfigBuildFonts
 	FcConfigCreate
 	FcConfigDestroy
+	FcConfigEnableHome
 	FcConfigFilename
 	FcConfigGetBlanks
 	FcConfigGetCache
@@ -159,3 +158,5 @@ EXPORTS
 	FcValueEqual
 	FcValuePrint
 	FcValueSave
+LIBRARY fontconfig
+VERSION @LT_CURRENT@.@LT_REVISION@