From d65835621dd3c731cee345a47d7a293fc12d9331 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20M=C3=B6ller?= <nisse@lysator.liu.se>
Date: Fri, 25 Nov 2005 18:09:28 +0100
Subject: [PATCH] (find_program): If argument contains a slash (most likely
because VPATH expansion in make), return the filename as is.
Rev: misc/run-tests:1.5
---
run-tests | 19 ++++++++++++++-----
1 file changed, 14 insertions(+), 5 deletions(-)
diff --git a/run-tests b/run-tests
index a15c744c..f240599f 100755
--- a/run-tests
+++ b/run-tests
@@ -12,12 +12,21 @@ fi
export srcdir
+# When used in make rules, we sometimes get the filenames VPATH
+# expanded, but usually not.
find_program () {
- if [ -x "$1" ] ; then
- echo "./$1"
- else
- echo "$srcdir/$1"
- fi
+ case "$1" in
+ */*)
+ echo "$1"
+ ;;
+ *)
+ if [ -x "$1" ] ; then
+ echo "./$1"
+ else
+ echo "$srcdir/$1"
+ fi
+ ;;
+ esac
}
env_program () {
--
GitLab