Mercurial > mxe-octave

comparison tools/pkg-install.py @ 4408:eb8b37422e16

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
pkg-install.py: Check for OCTAVE_HOME, then PREFIX.
author John W. Eaton <jwe@octave.org>
date Mon, 10 Jul 2017 13:26:33 -0400
parents 3c02ca69cbe5
children 4eae7db624e8
comparison
equal deleted inserted replaced
4407:e9b032b9340a 4408:eb8b37422e16
395 if os.environ.get("CONFIGURE_OPTIONS") != None: 395 if os.environ.get("CONFIGURE_OPTIONS") != None:
396 env.config_opts = os.environ['CONFIGURE_OPTIONS'] 396 env.config_opts = os.environ['CONFIGURE_OPTIONS']
397 397
398 # work out what arch is etc from mkoctfile/config 398 # work out what arch is etc from mkoctfile/config
399 if env.prefix == "": 399 if env.prefix == "":
400 env.prefix = os.popen(env.octave_config + " -p OCTAVE_HOME").read().rstrip("\r\n")
401 if env.prefix == "":
400 env.prefix = os.popen(env.octave_config + " -p PREFIX").read().rstrip("\r\n") 402 env.prefix = os.popen(env.octave_config + " -p PREFIX").read().rstrip("\r\n")
401 403
402 env.arch = os.popen(env.octave_config + " -p CANONICAL_HOST_TYPE").read().rstrip("\r\n") 404 env.arch = os.popen(env.octave_config + " -p CANONICAL_HOST_TYPE").read().rstrip("\r\n")
403 env.apiversion = os.popen(env.octave_config + " -p API_VERSION").read().rstrip("\r\n") 405 env.apiversion = os.popen(env.octave_config + " -p API_VERSION").read().rstrip("\r\n")
404 env.bindir = os.popen(env.octave_config + " -p BINDIR").read().rstrip("\r\n") 406 env.bindir = os.popen(env.octave_config + " -p BINDIR").read().rstrip("\r\n")