From dad2ab22ffdbc25bf87b712ff6fc2ea45f53e60c Mon Sep 17 00:00:00 2001
From: Harry Moffat <hkmoffa@sandia.gov>
Date: Tue, 10 Aug 2004 01:08:20 +0000
Subject: [PATCH] clib.dll needs to be copied by hand

---
 Cantera/python/Makefile.in | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/Cantera/python/Makefile.in b/Cantera/python/Makefile.in
index 46f3e5ab2..e64e67c7e 100755
--- a/Cantera/python/Makefile.in
+++ b/Cantera/python/Makefile.in
@@ -9,6 +9,9 @@
 #
 ###############################################################
 
+have_python_site_package_topdir=@local_python_inst@
+python_site_package_topdir=@python_prefix@
+
 CANTERA_LIBDIR= @buildlib@
 LIB_DEPS = $(CANTERA_LIBDIR)/libcantera.a $(CANTERA_LIBDIR)/libzeroD.a \
            $(CANTERA_LIBDIR)/liboneD.a \
@@ -41,10 +44,20 @@ _build: $(SRCS) $(LIB_DEPS)
 	(CXX=@CXX@; export CXX; CC=@CC@; export CC; @PYTHON_CMD@ setup.py build)
 	echo 'ok' > _build
 
+#
+# HKM -> If clib is built as a dll, it needs to be copied by hand to the
+#        site package directory.
+#
+CLIB_DLL=../../build/lib/i686-pc-win32/clib.dll
+CLIB_EXP=../../build/lib/i686-pc-win32/clib.exp
 
-_winbuild: $(SRCS) $(WIN_LIB_DEPS)
+_winbuild: $(SRCS) $(WIN_LIB_DEPS) $(CLIB_DLL)
 	touch src/pycantera.cpp 
 	(@PYTHON_CMD@ setup.py build)
+ifeq ($(have_python_site_package_topdir), 1)
+	(@INSTALL@ -m 755 $(CLIB_DLL) $(CLIB_EXP)  \
+            $(python_site_package_topdir)/lib/site-packages/Cantera)
+endif
 	echo 'ok' > _winbuild
 
 minbuild:
@@ -52,7 +65,7 @@ minbuild:
 
 install:
 ifeq (@local_python_inst@,1)
-	(@PYTHON_CMD@ setup.py install --prefix=@python_prefix@)
+	(@PYTHON_CMD@ setup.py install --prefix="@python_prefix@")
 else
 	(@PYTHON_CMD@ setup.py install)
 endif