diff options
| author | Tor Lillqvist <tml@iki.fi> | 2005-03-09 00:47:11 +0000 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2005-03-09 00:47:11 +0000 |
| commit | 79da4fe91ff0cee974e1ec7003857fb47c0f55d5 (patch) | |
| tree | 0fa34bbda527964cd26e16bf7335b78e7df02678 | |
| parent | d49dde9f900777f8482290dbafc6acb52a2b9432 (diff) | |
Get the DLL from "bin" where modern libtools put it, not "lib".
Check also drive letter prefix on Win32.
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rwxr-xr-x | fontconfig-zip.in | 2 | ||||
| -rw-r--r-- | src/fccfg.c | 4 |
3 files changed, 12 insertions, 2 deletions
@@ -1,3 +1,11 @@ +2005-03-09 Tor Lillqvist <tml@novell.com> + + * fontconfig-zip.in: Get the DLL from "bin" where modern libtools + put it, not "lib". + + * src/fccfg.c (FcConfigFileExists): Check also drive letter + prefix on Win32. + 2005-03-08 Keith Packard <keithp@keithp.com> * README: diff --git a/fontconfig-zip.in b/fontconfig-zip.in index fe56e63..4b36438 100755 --- a/fontconfig-zip.in +++ b/fontconfig-zip.in @@ -10,7 +10,7 @@ DEVZIP=/tmp/fontconfig-dev-@VERSION@.zip cd @prefix@ rm -f $ZIP zip $ZIP -@ <<EOF -lib/libfontconfig-@LT_CURRENT_MINUS_AGE@.dll +bin/libfontconfig-@LT_CURRENT_MINUS_AGE@.dll etc/fonts/fonts.conf EOF diff --git a/src/fccfg.c b/src/fccfg.c index 079e18c..551dbe1 100644 --- a/src/fccfg.c +++ b/src/fccfg.c @@ -1503,7 +1503,9 @@ FcConfigFileExists (const FcChar8 *dir, const FcChar8 *file) #ifdef _WIN32 if ((!path[0] || (path[strlen((char *) path)-1] != '/' && path[strlen((char *) path)-1] != '\\')) && - (file[0] != '/' && file[0] != '\\')) + !(file[0] == '/' || + file[0] == '\\' || + (isalpha (file[0]) && file[1] == ':' && (file[2] == '/' || file[2] == '\\')))) strcat ((char *) path, "\\"); #else if ((!path[0] || path[strlen((char *) path)-1] != '/') && file[0] != '/') |