Mercurial > mxe-octave
changeset 4193:32814edc00db
allow location of pkg directory to be specified
* configure.ac: New option, --with-pkg-dir.
* Makefile.in (PKG_DIR): Substitute value.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Mon, 29 Aug 2016 12:02:46 -0400 |
| parents | 438a4bfdc887 |
| children | 3dc897731d3b |
| files | Makefile.in configure.ac |
| diffstat | 2 files changed, 22 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile.in Mon Aug 29 11:21:19 2016 -0400 +++ b/Makefile.in Mon Aug 29 12:02:46 2016 -0400 @@ -245,7 +245,7 @@ MSYS_INFO_DIR := $(TOP_BUILD_DIR)/msys-info LOG_DIR := $(TOP_BUILD_DIR)/log TIMESTAMP := $(shell date +%Y%m%d_%H%M%S) -PKG_DIR := $(TOP_DIR)/pkg +PKG_DIR := @PKG_DIR@ TMP_DIR = $(TOP_BUILD_DIR)/tmp-$(1) MAKEFILE := $(TOP_BUILD_DIR)/Makefile PKGS := $(filter-out $(ALL_BUILD_TOOLS), $(shell $(SED) -n 's/^.* class="package">\([^<]*\)<.*$$/\1/p' '$(TOP_DIR)/index.html'))
--- a/configure.ac Mon Aug 29 11:21:19 2016 -0400 +++ b/configure.ac Mon Aug 29 12:02:46 2016 -0400 @@ -53,6 +53,27 @@ esac AC_SUBST(SHELL) +PKG_DIR="$abs_srcdir/pkg" +AC_ARG_WITH([pkg-dir], + [AS_HELP_STRING([--with-pkg-dir=DIR], + [use DIR as the location for downloaded packages (default: pkg)])]) +case $with_pkg_dir in + no) + AC_MSG_ERROR([A pkg directory is required]) + ;; + yes | "") + ;; + *) + PKG_DIR="$withval" + ## Ensure directory exists and that we refer to it using an absolute name + if test -d "$PKG_DIR"; then + mkdir -p "$PKG_DIR" + fi + PKG_DIR=`(cd "$PKG_DIR"; pwd)` + ;; +esac +AC_SUBST(PKG_DIR) + ENABLE_WINDOWS_64=no AC_ARG_ENABLE(windows-64, [AS_HELP_STRING([--enable-windows-64],