From: Félix Piédallu <felix@piedallu.me>
Date: Fri, 1 Dec 2017 14:57:41 +0000 (+0100)
Subject: Use formatting instead of weird path reconstruction
X-Git-Tag: archive/raspbian/1%0.1.106-3+rpi1^2~139^2^2~35
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=daeeb261a58372a544e38af2aed5af35c3624369;p=babl.git

Use formatting instead of weird path reconstruction
---

diff --git a/docs/meson.build b/docs/meson.build
index 04ba667..3a5115b 100644
--- a/docs/meson.build
+++ b/docs/meson.build
@@ -19,8 +19,7 @@ index_html_tmp = custom_target('index.html.tmp',
   input : [ babl_html_dump, ],
   output: [ 'index.html.tmp', ],
   command: [ 'bash', '-c',
-    'BABL_PATH="' + join_paths(meson.build_root(), 'extensions') +'"'
-    + ' ' + babl_html_dump.full_path()
+    'BABL_PATH="'+ join_paths(meson.build_root(), 'extensions') +'" '+ babl_html_dump.full_path()
   ],
   capture: true,
 )
@@ -35,7 +34,7 @@ index_html = custom_target('index.html',
   ],
   output: [ 'index.html', ],
   command: [ 'bash', '-c',
-    'cp '+ join_paths(meson.build_root(), meson.current_source_dir(), 'index-static.html') +' @OUTPUT@'
+    'cp '+ '@0@'.format(index_static_html) +' @OUTPUT@'
     +' && '+ xml_insert.path() +' @OUTPUT@ BablBase '+ index_html_tmp.full_path()
     +' && '+ xml_insert.path() +' @OUTPUT@ AUTHORS  '+ join_paths(meson.source_root(), 'AUTHORS')
     +' && '+ xml_insert.path() +' @OUTPUT@ TODO     '+ join_paths(meson.source_root(), 'TODO')