Mercurial > octave
changeset 21519:8e5eca2c5a64
pkg install: drop INSTALLDIR and stop calling configure with --prefix.
* pkg/private/configure_make.m: do not export INSTALLDIR, and do not call
configure with "--prefix=INSTALLDIR". This is not currently used. It
can even be ignored in the case of binary packages. Packages should be
robust to being built and then have their contents shuffled around later.
The recent changes to pkg/private/build.m also require this change (the
alternative fix would be to define desc.dir there but why would we?).
author | Carnë Draug <carandraug@octave.org> |
---|---|
date | Mon, 21 Mar 2016 23:55:38 +0000 |
parents | 2ee20a290d61 |
children | e1c921322ba2 |
files | scripts/pkg/private/configure_make.m |
diffstat | 1 files changed, 3 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/scripts/pkg/private/configure_make.m Mon Mar 21 00:02:43 2016 +0000 +++ b/scripts/pkg/private/configure_make.m Mon Mar 21 23:55:38 2016 +0000 @@ -51,8 +51,7 @@ cenv = {"MKOCTFILE"; mkoctfile_program; "OCTAVE_CONFIG"; octave_config_program; - "OCTAVE"; octave_binary; - "INSTALLDIR"; desc.dir}; + "OCTAVE"; octave_binary}; scenv = sprintf ("%s='%s' ", cenv{:}); ## Configure. @@ -70,8 +69,7 @@ if (isempty (getenv ("RANLIB"))) flags = [flags ' RANLIB="' mkoctfile("-p", "RANLIB") '"']; endif - cmd = ["cd '" src "'; " ... - scenv "./configure --prefix=\"" desc.dir "\"" flags]; + cmd = ["cd '" src "'; " scenv "./configure " flags]; [status, output] = shell (cmd, verbose); if (status != 0) rmdir (desc.dir, "s"); @@ -96,5 +94,6 @@ error ("pkg: error running `make' for the %s package.", desc.name); endif endif + endif endfunction