From: stevenj <stevenj@alum.mit.edu>
Date: Fri, 9 Jul 2010 16:34:03 +0000 (-0400)
Subject: if user specifies OCT_INSTALL_DIR, make M_INSTALL_DIR (if unspecified) default to... 
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=c903fe3839d4168dc7f170b14e2d7dc51ffd0aa9;p=nlopt.git

if user specifies OCT_INSTALL_DIR, make M_INSTALL_DIR (if unspecified) default to the same directory

darcs-hash:20100709163403-c8de0-5a5f3e0c9f02e3f9995138880a3d74883f96896d.gz
---

diff --git a/configure.ac b/configure.ac
index 3effe1a..00f2a29 100644
--- a/configure.ac
+++ b/configure.ac
@@ -245,6 +245,8 @@ elif test x"$OCT_INSTALL_DIR" = "x"; then
 		AC_MSG_WARN([can't find where to install octave scripts: won't be able to install octave plugin])
 		OCT_INSTALL_DIR=""
 	fi
+elif test x"$M_INSTALL_DIR" = "x"; then # user-specified OCT_INSTALL_DIR
+     M_INSTALL_DIR=$OCT_INSTALL_DIR
 fi
 
 if test x"$OCT_INSTALL_DIR" != "x"; then