From 7e10c16eee71c608a1dba1dd2fec8471567f6b61 Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl>
Date: Mon, 21 Nov 2016 17:00:50 +0100
Subject: Overhaul package installation

There are now three ways of installing from configure/make:

./configure --with-install-type=prefix (default)

libraries go into @libdir@
matlab tools/mex go into @datadir@/astra/matlab
octave tools/mex go into @datadir@/astra/octave
python module goes into site-packages

./configure --with-install-type=dir

libraries go into @prefix@/lib
matlab tools/mex go into @prefix@/matlab
octave tools/mex go into @prefix@/octave
python module goes into @prefix@/python

./configure --with-install-type=module

matlab tools/mex go into @prefix@/matlab
octave tools/mex go into @prefix@/octave
python module goes into site-packages
library is installed along with the matlab/octave/python module(s), with rpath
---
 build/linux/configure.ac | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

(limited to 'build/linux/configure.ac')

diff --git a/build/linux/configure.ac b/build/linux/configure.ac
index 7ccc8f5..26fa215 100644
--- a/build/linux/configure.ac
+++ b/build/linux/configure.ac
@@ -24,7 +24,7 @@ dnl
 dnl -----------------------------------------------------------------------
 dnl $Id$
 
-AC_INIT(astra_toolbox, 1.7.1)
+AC_INIT(astra, 1.7.1)
 AC_CONFIG_SRCDIR([Makefile.in])
 LT_INIT([disable-static])
 
@@ -274,6 +274,15 @@ AC_SUBST(CPPFLAGS_OS)
 VPATH_SRCDIR="$srcdir"
 AC_SUBST(VPATH_SRCDIR)
 
+
+# Installation type
+AC_ARG_WITH(install-type, [[  --with-install-type=prefix|module|dir  type of installation (default prefix)]],,with_install_type=prefix)
+
+INSTALL_TYPE=$with_install_type
+AC_SUBST(INSTALL_TYPE)
+
+
+
 # TODO:
 
 # Detection of tools:
@@ -299,4 +308,5 @@ echo "  Octave : $HAVEOCTAVE"
 echo "  Python : $HAVEPYTHON"
 echo
 echo "  prefix : $prefix"
+echo "  install: $with_install_type"
 echo
-- 
cgit v1.2.3