Commit 79da4fe9 authored by Tor Lillqvist's avatar Tor Lillqvist

Get the DLL from "bin" where modern libtools put it, not "lib".

Check also drive letter prefix on Win32.
parent d49dde9f
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:
......
......@@ -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
......
......@@ -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] != '/')
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment