diff options
| author | Víctor Manuel Jáquez Leal <vjaquez@igalia.com> | 2017-03-24 12:27:07 +0100 |
|---|---|---|
| committer | Stefan Sauer <ensonic@users.sf.net> | 2017-03-24 16:07:42 +0100 |
| commit | f42e26efe43ca0af7df339d0c564d9fbdd8b892a (patch) | |
| tree | d0c3ef1475d24e33308a0ed66918298c26e1d097 /gtkdoc-mkhtml.in | |
| parent | c4ad7a8117be414c8c138166af9709ed4bd4e777 (diff) | |
| download | gtk-doc-f42e26efe43ca0af7df339d0c564d9fbdd8b892a.tar.gz | |
gtkdoc-mk{html,pdf,man}: evaluate some shell variables
@datarootdir@ and @datadir@ are strings composed by unevealuated
shell variables. In python we have to evaluate those shell
variables.
This patch tries to do those evaluation to obtain the expected paths.
https://bugzilla.gnome.org/show_bug.cgi?id=780497
Diffstat (limited to 'gtkdoc-mkhtml.in')
| -rw-r--r-- | gtkdoc-mkhtml.in | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gtkdoc-mkhtml.in b/gtkdoc-mkhtml.in index 2a4c420..fc887f1 100644 --- a/gtkdoc-mkhtml.in +++ b/gtkdoc-mkhtml.in @@ -41,7 +41,6 @@ remaining_args = options.args[2:] if options.uninstalled: # this does not work from buiddir!=srcdir gtkdocdir = os.path.split(sys.argv[0])[0] - # traditional Bourne shells may not support -e here, use -f if not os.path.exists(gtkdocdir + '/gtk-doc.xsl'): # try to src dir (set from makefiles) too if os.path.exists(os.path.environ.get("ABS_TOP_SRCDIR", '') + '/gtk-doc.xsl'): @@ -49,10 +48,11 @@ if options.uninstalled: styledir=gtkdocdir + '/style' #echo "uninstalled, gtkdocdir=$gtkdocdir, cwd=$PWD" else: - # the first two are needed to resolve datadir + # the first vars are needed to resolve datadir prefix='@prefix@' - datarootdir='@datarootdir@' - gtkdocdir='@datadir@/gtk-doc/data' + datarootdir="@datarootdir@".replace('${prefix}', prefix) + datadir="@datadir@".replace('${datarootdir}', datarootdir) + gtkdocdir=os.path.join(datadir, 'gtk-doc/data') styledir=gtkdocdir # We need to use a wrapper because there's no other way to conditionally pass |