From 0d6cd93f95821ac1df418439dd0b9156b0489a37 Mon Sep 17 00:00:00 2001 From: Thomas Nagy Date: Sat, 29 Sep 2012 17:32:46 +0200 Subject: [PATCH] empty --prefix --- waflib/Configure.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/waflib/Configure.py b/waflib/Configure.py index 052706e4..ef0fdc2a 100644 --- a/waflib/Configure.py +++ b/waflib/Configure.py @@ -254,7 +254,10 @@ class ConfigurationContext(Context.Context): :param env: a ConfigSet, usually ``conf.env`` """ if not env.PREFIX: - env.PREFIX = os.path.abspath(os.path.expanduser(Options.options.prefix)) + if Options.options.prefix or Utils.is_win32: + env.PREFIX = os.path.abspath(os.path.expanduser(Options.options.prefix)) + else: + env.PREFIX = '' if not env.BINDIR: env.BINDIR = Utils.subst_vars('${PREFIX}/bin', env) if not env.LIBDIR: