aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild
diff options
context:
space:
mode:
Diffstat (limited to 'mesonbuild')
-rw-r--r--mesonbuild/build.py2
-rw-r--r--mesonbuild/modules/gnome.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/mesonbuild/build.py b/mesonbuild/build.py
index aa6e70b..65438b0 100644
--- a/mesonbuild/build.py
+++ b/mesonbuild/build.py
@@ -1741,7 +1741,7 @@ class CustomTarget(Target):
if i.strip() == '':
raise InvalidArguments('Output must not consist only of whitespace.')
if has_path_sep(i):
- raise InvalidArguments('Output must not contain a path segment.')
+ raise InvalidArguments('Output {!r} must not contain a path segment.'.format(i))
if '@INPUT@' in i or '@INPUT0@' in i:
m = 'Output cannot contain @INPUT@ or @INPUT0@, did you ' \
'mean @PLAINNAME@ or @BASENAME@?'
diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py
index f3eabda..1459ffe 100644
--- a/mesonbuild/modules/gnome.py
+++ b/mesonbuild/modules/gnome.py
@@ -1017,7 +1017,7 @@ This will become a hard error in the future.''')
output = namebase + '-docbook'
outputs = []
for f in xml_files:
- outputs.append('{}-{}'.format(docbook, f))
+ outputs.append('{}-{}'.format(docbook, os.path.basename(str(f))))
if mesonlib.version_compare(glib_version, '>= 2.56.2'):
custom_kwargs = {'input': xml_files,