From: Michael Catanzaro <mcatanzaro@igalia.com>
Date: Thu, 31 May 2018 17:38:40 +0000 (+0100)
Subject: Fix gtk-doc generation with gtk-doc master
X-Git-Tag: archive/raspbian/2.4.11-4+rpi1~1^2~2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=a3eec06452315d94464b0356f535eb58f22d5f1d;p=webkitgtk.git

Fix gtk-doc generation with gtk-doc master

===================================================================

Gbp-Pq: Name gtk-doc-fix2.patch
---

diff --git a/Tools/gtk/gtkdoc.py b/Tools/gtk/gtkdoc.py
index ef29f42..a433a30 100644
--- a/Tools/gtk/gtkdoc.py
+++ b/Tools/gtk/gtkdoc.py
@@ -309,9 +309,9 @@ class GTKDoc(object):
             ldflags = ' "-L%s" ' % self.library_path + ldflags
             current_ld_library_path = env.get('LD_LIBRARY_PATH')
             if current_ld_library_path:
-                env['RUN'] = 'LD_LIBRARY_PATH="%s:%s" ' % (self.library_path, current_ld_library_path)
+                env['LD_LIBRARY_PATH'] = '%s:%s' % (self.library_path, current_ld_library_path)
             else:
-                env['RUN'] = 'LD_LIBRARY_PATH="%s" ' % self.library_path
+                env['LD_LIBRARY_PATH'] = self.library_path
 
         if ldflags:
             env['LDFLAGS'] = '%s %s' % (ldflags, env.get('LDFLAGS', ''))
@@ -322,8 +322,6 @@ class GTKDoc(object):
             self.logger.debug('CFLAGS=%s', env['CFLAGS'])
         if 'LDFLAGS' in env:
             self.logger.debug('LDFLAGS %s', env['LDFLAGS'])
-        if 'RUN' in env:
-            self.logger.debug('RUN=%s', env['RUN'])
         self._run_command(['gtkdoc-scangobj', '--module=%s' % self.module_name],
                           env=env, cwd=self.output_dir)