diff --git a/build_scripts/main.py b/build_scripts/main.py index 5bf3ade..65085a6 100644 --- a/build_scripts/main.py +++ b/build_scripts/main.py @@ -162,7 +162,7 @@ qt_src_dir = '' # This is used automatically by distutils.command.install object, to # specify final installation location. -OPTION_FINAL_INSTALL_PREFIX = option_value("prefix") +OPTION_FINAL_INSTALL_PREFIX = option_value("prefix", False) if OPTION_QT_VERSION is None: diff --git a/build_scripts/utils.py b/build_scripts/utils.py index 4c23a62..feeb5ab 100644 --- a/build_scripts/utils.py +++ b/build_scripts/utils.py @@ -79,18 +79,20 @@ def has_option(name): return False -def option_value(name): +def option_value(name, remove=True): for index, option in enumerate(sys.argv): if option == '--' + name: if index+1 >= len(sys.argv): raise DistutilsOptionError("The option {} requires a " "value".format(option)) value = sys.argv[index+1] - sys.argv[index:index+2] = [] + if remove: + sys.argv[index:index+2] = [] return value if option.startswith('--' + name + '='): value = option[len(name)+3:] - sys.argv[index:index+1] = [] + if remove: + sys.argv[index:index+1] = [] return value env_val = os.getenv(name.upper().replace('-', '_')) return env_val -- 2.1.4