From 27b6aa9f5c5b432d99f2678224c8fc307da0c3c4 Mon Sep 17 00:00:00 2001 From: Dave Goodwin Date: Sun, 20 Apr 2003 13:18:09 +0000 Subject: [PATCH] perform configuration of setup.py --- Cantera/python/Makefile.in | 6 +++++- Cantera/python/{setup.py => setup.py.in} | 13 ++++++++----- 2 files changed, 13 insertions(+), 6 deletions(-) rename Cantera/python/{setup.py => setup.py.in} (82%) mode change 100755 => 100644 diff --git a/Cantera/python/Makefile.in b/Cantera/python/Makefile.in index c93803e7f..f1ab656cf 100755 --- a/Cantera/python/Makefile.in +++ b/Cantera/python/Makefile.in @@ -29,12 +29,16 @@ SRCS = src/ctphase_methods.cpp \ all: _build _build: $(SRCS) $(LIB_DEPS) - touch src/pycantera.cpp + touch src/pycantera.cpp @PYTHON_CMD@ setup.py build echo 'ok' > _build install: +ifeq (@local_inst@,1) + @PYTHON_CMD@ setup.py install --prefix=@prefix@ +else @PYTHON_CMD@ setup.py install +endif clean: @PYTHON_CMD@ setup.py clean diff --git a/Cantera/python/setup.py b/Cantera/python/setup.py.in old mode 100755 new mode 100644 similarity index 82% rename from Cantera/python/setup.py rename to Cantera/python/setup.py.in index fb2c0aca0..4af7a2846 --- a/Cantera/python/setup.py +++ b/Cantera/python/setup.py.in @@ -1,9 +1,12 @@ #!/usr/bin/python2 - -from distutils.core import setup, Extension - -libs = [] import sys +try: + from distutils.core import setup, Extension +except: + print 'could not import distutils. Skipping Python interface.' + sys.exit(0) + +libs = [] platform = sys.platform if platform == "win32": @@ -35,7 +38,7 @@ setup(name="Cantera", ["src/pycantera.cpp"], include_dirs=["../../build/include", "src", "../clib/src"], - library_dirs = ["../../build/lib"], libraries = libs) + library_dirs = ["@buildlib@"], libraries = libs) ], )