aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--mesonbuild/backend/backends.py2
-rw-r--r--test cases/common/195 generator in subdir/com/mesonbuild/meson.build2
-rw-r--r--test cases/common/195 generator in subdir/com/mesonbuild/tooldir/genprog.py (renamed from test cases/common/195 generator in subdir/com/mesonbuild/genprog.py)0
3 files changed, 2 insertions, 2 deletions
diff --git a/mesonbuild/backend/backends.py b/mesonbuild/backend/backends.py
index 6370800..408cd0a 100644
--- a/mesonbuild/backend/backends.py
+++ b/mesonbuild/backend/backends.py
@@ -633,7 +633,7 @@ class Backend:
if isinstance(exe, (programs.ExternalProgram,
build.BuildTarget, build.CustomTarget)):
- basename = exe.name
+ basename = os.path.basename(exe.name)
elif isinstance(exe, mesonlib.File):
basename = os.path.basename(exe.fname)
else:
diff --git a/test cases/common/195 generator in subdir/com/mesonbuild/meson.build b/test cases/common/195 generator in subdir/com/mesonbuild/meson.build
index 4808743..6469a2e 100644
--- a/test cases/common/195 generator in subdir/com/mesonbuild/meson.build
+++ b/test cases/common/195 generator in subdir/com/mesonbuild/meson.build
@@ -1,4 +1,4 @@
-gprog = find_program('genprog.py')
+gprog = find_program('tooldir/genprog.py')
gen = generator(gprog, \
output : ['@BASENAME@.c', '@BASENAME@.h'],
diff --git a/test cases/common/195 generator in subdir/com/mesonbuild/genprog.py b/test cases/common/195 generator in subdir/com/mesonbuild/tooldir/genprog.py
index 681c43a..681c43a 100644
--- a/test cases/common/195 generator in subdir/com/mesonbuild/genprog.py
+++ b/test cases/common/195 generator in subdir/com/mesonbuild/tooldir/genprog.py