|
3040
|
1 diff -uNr a/main.c b/main.c |
|
|
2 --- a/main.c 2013-01-22 08:11:53.000000000 -0500 |
|
|
3 +++ b/main.c 2013-06-10 13:16:55.637783224 -0400 |
|
|
4 @@ -287,29 +287,7 @@ |
|
|
5 static void |
|
|
6 init_pc_path (void) |
|
|
7 { |
|
|
8 -#ifdef G_OS_WIN32 |
|
|
9 - char *instdir, *lpath, *shpath; |
|
|
10 - |
|
|
11 - instdir = g_win32_get_package_installation_directory_of_module (NULL); |
|
|
12 - if (instdir == NULL) |
|
|
13 - { |
|
|
14 - /* This only happens when GetModuleFilename() fails. If it does, that |
|
|
15 - * failure should be investigated and fixed. |
|
|
16 - */ |
|
|
17 - debug_spew ("g_win32_get_package_installation_directory_of_module failed\n"); |
|
|
18 - return; |
|
|
19 - } |
|
|
20 - |
|
|
21 - lpath = g_build_filename (instdir, "lib", "pkgconfig", NULL); |
|
|
22 - shpath = g_build_filename (instdir, "share", "pkgconfig", NULL); |
|
|
23 - pkg_config_pc_path = g_strconcat (lpath, G_SEARCHPATH_SEPARATOR_S, shpath, |
|
|
24 - NULL); |
|
|
25 - g_free (instdir); |
|
|
26 - g_free (lpath); |
|
|
27 - g_free (shpath); |
|
|
28 -#else |
|
|
29 pkg_config_pc_path = PKG_CONFIG_PC_PATH; |
|
|
30 -#endif |
|
|
31 } |
|
|
32 |
|
|
33 static gboolean |
|
|
34 diff -uNr a/Makefile.am b/Makefile.am |
|
|
35 --- a/Makefile.am 2013-01-23 14:07:39.000000000 -0500 |
|
|
36 +++ b/Makefile.am 2013-06-10 12:31:32.984044807 -0400 |
|
|
37 @@ -9,18 +9,10 @@ |
|
|
38 SUBDIRS = $(GLIB_SUBDIR) . check |
|
|
39 DIST_SUBDIRS = $(SUBDIRS) |
|
|
40 |
|
|
41 -# Escape paths properly on windows |
|
|
42 -if NATIVE_WIN32 |
|
|
43 AM_CPPFLAGS = \ |
|
|
44 -DPKG_CONFIG_PC_PATH="\"$(subst /,\/,$(pc_path))\"" \ |
|
|
45 -DPKG_CONFIG_SYSTEM_INCLUDE_PATH="\"$(subst /,\/,$(system_include_path))\"" \ |
|
|
46 -DPKG_CONFIG_SYSTEM_LIBRARY_PATH="\"$(subst /,\/,$(system_library_path))\"" |
|
|
47 -else |
|
|
48 -AM_CPPFLAGS = \ |
|
|
49 - -DPKG_CONFIG_PC_PATH="\"$(pc_path)\"" \ |
|
|
50 - -DPKG_CONFIG_SYSTEM_INCLUDE_PATH="\"$(system_include_path)\"" \ |
|
|
51 - -DPKG_CONFIG_SYSTEM_LIBRARY_PATH="\"$(system_library_path)\"" |
|
|
52 -endif |
|
|
53 |
|
|
54 AM_CFLAGS = \ |
|
|
55 $(WARN_CFLAGS) \ |
