Title: [101189] trunk/Tools
- Revision
- 101189
- Author
- [email protected]
- Date
- 2011-11-26 00:59:05 -0800 (Sat, 26 Nov 2011)
Log Message
Try to fix the build after r101174.
* gtk/generate-gtkdoc: Properly handle empty PKG_CONFIG_PATHs.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (101188 => 101189)
--- trunk/Tools/ChangeLog 2011-11-26 07:17:59 UTC (rev 101188)
+++ trunk/Tools/ChangeLog 2011-11-26 08:59:05 UTC (rev 101189)
@@ -1,3 +1,9 @@
+2011-11-26 Martin Robinson <[email protected]>
+
+ Try to fix the build after r101174.
+
+ * gtk/generate-gtkdoc: Properly handle empty PKG_CONFIG_PATHs.
+
2011-11-17 Martin Robinson <[email protected]>
[GTK] Integrate build-gtkdoc into build-webkit and make
Modified: trunk/Tools/gtk/generate-gtkdoc (101188 => 101189)
--- trunk/Tools/gtk/generate-gtkdoc 2011-11-26 07:17:59 UTC (rev 101188)
+++ trunk/Tools/gtk/generate-gtkdoc 2011-11-26 08:59:05 UTC (rev 101189)
@@ -91,8 +91,10 @@
# We need to add the _javascript_Core build directory to the PKG_CONFIG_PATH
# so that pkgconfig can properly resolve the libjavascriptcore dependency.
-os.environ['PKG_CONFIG_PATH'] = common.build_path('Source', '_javascript_Core') \
- + ':' + os.environ.get('PKG_CONFIG_PATH')
+pkg_config_path = os.environ.get("PKG_CONFIG_PATH")
+os.environ['PKG_CONFIG_PATH'] = common.build_path('Source', '_javascript_Core')
+if pkg_config_path:
+ os.environ['PKG_CONFIG_PATH'] += + ':' + pkg_config_path
print "Generating WebKit1 documentation..."
pkg_config_path, options = get_webkit1_options()
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
