From a99c472c5dce7f16822294521ab6f33e01864052 Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl>
Date: Mon, 21 Nov 2016 17:00:20 +0100
Subject: Update python package name from PyASTRAToolbox to astra-toolbox

---
 python/builder.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'python/builder.py')

diff --git a/python/builder.py b/python/builder.py
index 243888b..7c55054 100644
--- a/python/builder.py
+++ b/python/builder.py
@@ -74,7 +74,7 @@ for m in ext_modules:
   if m.name == 'astra.plugin_c':
     m.sources.append('astra/src/PythonPluginAlgorithm.cpp')
 
-setup (name = 'PyASTRAToolbox',
+setup (name = 'astra-toolbox',
        version = '1.7.1',
        description = 'Python interface to the ASTRA-Toolbox',
        author='D.M. Pelt',
-- 
cgit v1.2.3


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
---
 python/builder.py | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'python/builder.py')

diff --git a/python/builder.py b/python/builder.py
index 7c55054..1105169 100644
--- a/python/builder.py
+++ b/python/builder.py
@@ -64,6 +64,14 @@ if cfgHasToBeUpdated:
     cfg.write(cfgToWrite)
     cfg.close()
 
+
+pkgdata = { }
+try:
+    if os.environ['ASTRA_INSTALL_LIBRARY_AS_DATA']:
+        pkgdata['astra'] = [os.environ['ASTRA_INSTALL_LIBRARY_AS_DATA']]
+except KeyError:
+    pass
+
 cmdclass = { }
 ext_modules = [ ]
 
@@ -88,5 +96,6 @@ setup (name = 'astra-toolbox',
        cmdclass = cmdclass,
        #ext_modules = [Extension("astra","astra/astra.pyx")],
        packages=['astra', 'astra.plugins'],
+       package_data=pkgdata,
        requires=["numpy"],
 	)
-- 
cgit v1.2.3