Changeset 101189 in webkit

Timestamp:

Nov 26, 2011, 12:59:05 AM (15 years ago)

Author:

Martin Robinson

Message:

Try to fix the build after r101174.

• gtk/generate-gtkdoc: Properly handle empty PKG_CONFIG_PATHs.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• gtk/generate-gtkdoc (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2011-11-26  Martin Robinson  <mrobinson@igalia.com>
+
+        Try to fix the build after r101174.
+
+        * gtk/generate-gtkdoc: Properly handle empty PKG_CONFIG_PATHs.
+
 2011-11-17  Martin Robinson  <mrobinson@igalia.com>
 

trunk/Tools/gtk/generate-gtkdoc

@@ -92 +92 @@
 # We need to add the JavaScriptCore 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', 'JavaScriptCore') \
-                                + ':' + os.environ.get('PKG_CONFIG_PATH')
+pkg_config_path = os.environ.get("PKG_CONFIG_PATH")
+os.environ['PKG_CONFIG_PATH'] = common.build_path('Source', 'JavaScriptCore')
+if pkg_config_path:
+    os.environ['PKG_CONFIG_PATH'] += + ':' + pkg_config_path
 
 print "Generating WebKit1 documentation..."