[gtk-doc] mkman,mkpdf: also fix path arg handling

[Stefan Sauer <stefkost src gnome org>]

commit 42bdfcd7e9e2b3e38b0cedfccb55f2dcb85a3e44
Author: Stefan Sauer <ensonic users sf net>
Date:   Sun May 28 19:24:53 2017 +0200

    mkman,mkpdf: also fix path arg handling
    
    In mkman also support multiple path args. In mkpdf fix the option name and
    apply the same fix as in previous commit.

 gtkdoc-mkman.in |    2 +-
 gtkdoc/mkman.py |    7 +++----
 gtkdoc/mkpdf.py |    9 ++++-----
 3 files changed, 8 insertions(+), 10 deletions(-)
---
diff --git a/gtkdoc-mkman.in b/gtkdoc-mkman.in
index 8c90118..c5445cd 100644
--- a/gtkdoc-mkman.in
+++ b/gtkdoc-mkman.in
@@ -34,7 +34,7 @@ if __name__ == '__main__':
     parser.add_argument('--version', action='version', version=config.version)
     parser.add_argument('--verbose', default=False, action='store_true',
                         help='Print extra output while processing')
-    parser.add_argument('--path', default='',
+    parser.add_argument('--path', default=[], action='append',
                         help='Extra source directories')
     parser.add_argument('args', nargs=2,
                         help='MODULE DRIVER_FILE')
diff --git a/gtkdoc/mkman.py b/gtkdoc/mkman.py
index 2658cf0..515b37f 100644
--- a/gtkdoc/mkman.py
+++ b/gtkdoc/mkman.py
@@ -36,10 +36,9 @@ def run(options):
 
     # we could do "--path $PWD " to avoid needing rewriting entities that
     # are copied from the header into docs under xml
-    if options.path == '':
-        path_arg = []
-    else:
-        path_arg = ['--path', options.path]
+    path_arg = []
+    for path in options.path:
+        path_arg += ['--path', path]
 
     # would it make sense to create man pages only for certain refentries
     # e.g. for tools
diff --git a/gtkdoc/mkpdf.py b/gtkdoc/mkpdf.py
index 56d0f62..953116d 100755
--- a/gtkdoc/mkpdf.py
+++ b/gtkdoc/mkpdf.py
@@ -30,13 +30,12 @@ from . import config
 
 
 def run_xsltproc(options, args):
+    command = [config.xsltproc]
     # we could do "--path $PWD " to avoid needing rewriting entities that are
     # copied from the header into docs under xml
-    if len(options.path) == 0:
-        cmd = [config.xsltproc] + args
-    else:
-        cmd = [config.xsltproc, '--path'] + options.searchpath + args
-    pc = subprocess.Popen(cmd, stderr=subprocess.PIPE)
+    for path in options.path:
+        command += ['--path', path]
+    pc = subprocess.Popen(command + args, stderr=subprocess.PIPE)
     (o, stde) = pc.communicate()
     open('profile.txt', 'wb').write(stde)
     return pc.returncode