pal1000
/
pkgconf
forked from ariadne/pkgconf
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #71 from Alexpux/master 

Fix expanding PKG_DEFAULT_PATH under Windows.
feature/tap-sh
William Pitcock 2014-08-14 22:16:29 -05:00
parent bff5f15d0a 39e3fc1c46
commit f1a0047ade
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
pkg.c
View File

@ -19,7 +19,7 @@
#ifdef _WIN32 #ifdef _WIN32
# define PKG_CONFIG_REG_KEY "Software\\pkgconfig\\PKG_CONFIG_PATH" # define PKG_CONFIG_REG_KEY "Software\\pkgconfig\\PKG_CONFIG_PATH"
# undef PKG_DEFAULT_PATH # undef PKG_DEFAULT_PATH
# define PKG_DEFAULT_PATH "../lib/pkgconfig:../share/pkgconfig" # define PKG_DEFAULT_PATH "../lib/pkgconfig;../share/pkgconfig"
#endif #endif
#define PKG_CONFIG_EXT ".pc" #define PKG_CONFIG_EXT ".pc"
@ -116,19 +116,24 @@ get_pkgconfig_path(void)
return env_path; return env_path;
#ifdef _WIN32 #ifdef _WIN32
GetModuleFileName(NULL, namebuf, sizeof namebuf); int sizepath = GetModuleFileName(NULL, namebuf, sizeof namebuf);
char * winslash;
p = strrchr(namebuf, '\\'); namebuf[sizepath] = '\0';
if (p == NULL) while ((winslash = strchr (namebuf, '\\')) != NULL)
p = strrchr(namebuf, '/'); {
*winslash = '/';
}
p = strrchr(namebuf, '/');
if (p == NULL) if (p == NULL)
return PKG_DEFAULT_PATH; return PKG_DEFAULT_PATH;
*p = '\0'; *p = '\0';
strlcpy(outbuf, namebuf, sizeof outbuf); strlcpy(outbuf, namebuf, sizeof outbuf);
strlcat(outbuf, "/", sizeof outbuf);
strlcat(outbuf, "../lib/pkgconfig", sizeof outbuf); strlcat(outbuf, "../lib/pkgconfig", sizeof outbuf);
strlcat(outbuf, ":", sizeof outbuf); strlcat(outbuf, ";", sizeof outbuf);
strlcat(outbuf, namebuf, sizeof outbuf); strlcat(outbuf, namebuf, sizeof outbuf);
strlcat(outbuf, "/", sizeof outbuf);
strlcat(outbuf, "../share/pkgconfig", sizeof outbuf); strlcat(outbuf, "../share/pkgconfig", sizeof outbuf);
return outbuf; return outbuf;