[babl] Use formatting instead of weird path reconstruction
- From: Øyvind Kolås <ok src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [babl] Use formatting instead of weird path reconstruction
- Date: Sat, 16 Dec 2017 01:49:45 +0000 (UTC)
commit daeeb261a58372a544e38af2aed5af35c3624369
Author: Félix Piédallu <felix piedallu me>
Date: Fri Dec 1 15:57:41 2017 +0100
Use formatting instead of weird path reconstruction
docs/meson.build | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
---
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')
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]