summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEmmanuele Bassi <ebassi@gnome.org>2020-04-14 13:27:26 +0100
committerEmmanuele Bassi <ebassi@gnome.org>2020-04-14 13:29:14 +0100
commit0896d630769ae8f44f13d8e7784165601a140e80 (patch)
treefcc824bb6cf5a50b4d3fc03ccd86eaee789dfb0f
parent2f6d743908a35aea7e984a4db3f3dd8cf26577de (diff)
downloadpango-0896d630769ae8f44f13d8e7784165601a140e80.tar.gz
build: Do not use source/build_root functions
Meson has the include_directories() object to specify inclusion paths that refer to both the source and build directories.
-rw-r--r--docs/meson.build3
-rw-r--r--meson.build1
2 files changed, 2 insertions, 2 deletions
diff --git a/docs/meson.build b/docs/meson.build
index a99448af..e5b7ba7d 100644
--- a/docs/meson.build
+++ b/docs/meson.build
@@ -72,8 +72,7 @@ docpath = join_paths(pango_datadir, 'gtk-doc', 'html')
gnome.gtkdoc('pango',
main_xml: 'pango-docs.sgml',
src_dir: [
- join_paths(meson.source_root(), 'pango'),
- join_paths(meson.build_root(), 'pango'),
+ pango_inc,
],
dependencies: docdeps,
gobject_typesfile: configure_file(input: 'pango.types.in',
diff --git a/meson.build b/meson.build
index d4cff2af..dc634c8a 100644
--- a/meson.build
+++ b/meson.build
@@ -539,6 +539,7 @@ pkgconfig = import('pkgconfig')
configure_file(output: 'config.h', configuration: pango_conf)
root_inc = include_directories('.')
+pango_inc = include_directories('pango')
subdir('pango')
subdir('utils')