diff options
| author | Tollef Fog Heen <tfheen@qurzaw> | 2009-06-30 03:47:01 +0200 |
|---|---|---|
| committer | Tollef Fog Heen <tfheen@qurzaw> | 2009-06-30 03:47:01 +0200 |
| commit | 39663612a6d0edc07f194eb02d697256c70f27eb (patch) | |
| tree | 9b6f3181b508b711f686ed5d80a9670019fef3d0 /pkg.h | |
| parent | 9b49307caed60772474f54eb6b2cc8af22132293 (diff) | |
| download | pkg-config-39663612a6d0edc07f194eb02d697256c70f27eb.tar.gz | |
2009-06-12 Tor Lillqvist <tml@iki.fi>
* parse.c: On Win32, if the value of a a variable other than the
"prefix" one starts with the non-overridden value of "prefix",
then replace that prefix, too, with the run-time one.
To avoid shadowing warnings, rename a 'p' variable to 'q'.
* pkg-config.1: Corresponding update.
* main.c
* pkg.h: Move the Win32 redefinition of PKG_CONFIG_PC_PATH from
main.c to pkg.h as it now is needed in pkg.c, too.
Diffstat (limited to 'pkg.h')
| -rw-r--r-- | pkg.h | 11 |
1 files changed, 11 insertions, 0 deletions
@@ -26,6 +26,17 @@ #include "glib-1.2.10/glib.h" #endif +#ifdef G_OS_WIN32 +/* No hardcoded paths in the binary, thanks */ +/* It's OK to leak this */ +#undef PKG_CONFIG_PC_PATH +#define PKG_CONFIG_PC_PATH \ + g_strconcat (g_win32_get_package_installation_subdirectory (NULL, NULL, "lib/pkgconfig"), \ + ";", \ + g_win32_get_package_installation_subdirectory (NULL, NULL, "share/pkgconfig"), \ + NULL) +#endif + typedef enum { LESS_THAN, |