Mercurial > mxe-octave
diff hg-octave-dist.mk @ 4321:8ec05e08aa22
hg-octave-dist: Also install native Octave
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Fri, 06 Jan 2017 13:15:40 -0500 |
| parents | 4a414e5b16a4 |
| children | 2a8b5cf2085c |
line wrap: on
line diff
--- a/hg-octave-dist.mk Wed Jan 04 21:29:05 2017 -0500 +++ b/hg-octave-dist.mk Fri Jan 06 13:15:40 2017 -0500 @@ -10,6 +10,9 @@ ## ## The version number set in the mercurial sources for Octave must ## match the one used in src/default-octave.mk. +## +## We also install the resulting binary to run natively when +## building packages during a cross build. ## Set PATH, PKG_CONFIG_PATH, and LD_LIBRARY_PATH to the original ## values from the environment so that we avoid the tools that we've @@ -33,8 +36,9 @@ mkdir .build && \ $(HG_OCTAVE_DIST_ENV_FLAGS) ./bootstrap && \ cd .build && \ - $(HG_OCTAVE_DIST_ENV_FLAGS) ../configure && \ + $(HG_OCTAVE_DIST_ENV_FLAGS) ../configure --prefix=$(ROOT_PREFIX) && \ $(HG_OCTAVE_DIST_ENV_FLAGS) make -j '$(JOBS)' all && \ + $(HG_OCTAVE_DIST_ENV_FLAGS) make -j '$(JOBS)' install && \ $(HG_OCTAVE_DIST_ENV_FLAGS) make -j '$(JOBS)' dist && \ mv '$(default-octave_FILE)' '$(PKG_DIR)'