summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTollef Fog Heen <tfheen@err.no>2008-01-31 02:27:33 +0100
committerTollef Fog Heen <tfheen@err.no>2008-01-31 02:27:33 +0100
commit3e6c5da35ab467ed6d84d6e8502cf51af4561818 (patch)
tree3fb2dfa1b461a9d42cbd9acd0e980cf4712e0e3f
parent515745885f68fcb121197e1d5e43c3ee77edce3f (diff)
pkg.c (string_list_to_string): Patch from Paul Bender so flags other
than -I and -L are passed through (with mangling) when PKG_CONFIG_SYSROOT_DIR is set.
-rw-r--r--ChangeLog6
-rw-r--r--pkg.c6
2 files changed, 11 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 5a4b3a1..6bfe2ed 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-01-31 Tollef Fog Heen <tfheen@err.no>
+
+ * pkg.c (string_list_to_string): Patch from Paul Bender so flags
+ other than -I and -L are passed through (with mangling) when
+ PKG_CONFIG_SYSROOT_DIR is set.
+
2008-01-16 Tollef Fog Heen <tfheen@err.no>
* NEWS, configure.in: Release 0.23
diff --git a/pkg.c b/pkg.c
index 7f252bd..540d793 100644
--- a/pkg.c
+++ b/pkg.c
@@ -483,8 +483,12 @@ string_list_to_string (GSList *list)
g_string_append (str, pcsysrootdir);
g_string_append (str, tmpstr+2);
}
+ else
+ {
+ g_string_append (str, tmpstr);
+ }
}
- else
+ else
{
g_string_append (str, tmpstr);
}