From 845d7d3a3b5727a084dee9f5690cc88482673256 Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Sat, 25 Apr 2020 12:36:00 +0200 Subject: [PATCH] Recognize dist, distcheck better to set app name Previously, `dist` had to be the first argument to waf. If it came in a different position (e.g. `APPNAME=Ardour ./waf tarball dist`) or `distcheck` was used instead of `dist`, the resulting archive was named `noname-....tar.bz2`. Signed-off-by: Nils Philippsen --- wscript | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wscript b/wscript index 5375272182..ea6e5e4ec9 100644 --- a/wscript +++ b/wscript @@ -222,9 +222,9 @@ VERSION = sanitize(V) PROGRAM_VERSION = sanitize(MAJOR) del sanitize -if len (sys.argv) > 1 and sys.argv[1] == 'dist': +if any(arg in ('dist', 'distcheck') for arg in sys.argv[1:]): if not 'APPNAME' in os.environ: - print ("You must define APPNAME in the environment when running ./waf dist") + print ("You must define APPNAME in the environment when running ./waf dist/distcheck") sys.exit (1) APPNAME = os.environ['APPNAME'];