From b93bd3bb2ff96bb87a148a17bc7b6a85550e5eae Mon Sep 17 00:00:00 2001 From: Harry Moffat Date: Sat, 22 Aug 2009 22:47:38 +0000 Subject: [PATCH] Fixed an error in Cantera.mak that appears just for macs. added a couple more files to the install procedure that were missing. --- Cantera/cxx/include/Cantera.mak.in | 6 +++--- Cantera/cxx/include/Cantera_bt.mak.in | 2 +- Makefile.in | 2 ++ 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Cantera/cxx/include/Cantera.mak.in b/Cantera/cxx/include/Cantera.mak.in index 1be0fd653..cb0cfec51 100644 --- a/Cantera/cxx/include/Cantera.mak.in +++ b/Cantera/cxx/include/Cantera.mak.in @@ -56,15 +56,15 @@ CANTERA_CORE_LIBS_DEP= @CANTERA_CORE_LIBS_DEP@ $(CANTERA_LIBSDIR)/libctcxx.a # # Cantera Boost Include # -CANTERA_BOOST_INCLUDES= @BOOST_INCLUDE@ +CANTERA_BOOST_INCLUDES=@BOOST_INCLUDE@ # # Location of the boost library that Cantera linked against # -CANTERA_BOOST_LIB_DIR= @BOOST_LIB_DIR@ +CANTERA_BOOST_LIB_DIR=@BOOST_LIB_DIR@ # # Linkage extras for linking against boost # -ifeq ($(CANTERA_BOOST_LIB_DIR),"") +ifeq ("x$(CANTERA_BOOST_LIB_DIR)","x") CANTERA_BOOST_LIBS= else CANTERA_BOOST_LIBS= -L$(CANTERA_BOOST_LIB_DIR) -l@BOOST_LIB@ diff --git a/Cantera/cxx/include/Cantera_bt.mak.in b/Cantera/cxx/include/Cantera_bt.mak.in index 134dd8eb7..f9566f2bf 100644 --- a/Cantera/cxx/include/Cantera_bt.mak.in +++ b/Cantera/cxx/include/Cantera_bt.mak.in @@ -64,7 +64,7 @@ CANTERA_BOOST_LIB_DIR= @BOOST_LIB_DIR@ # # Linkage extras for linking against boost # -ifeq ($(CANTERA_BOOST_LIB_DIR),"") +ifeq ("x$(CANTERA_BOOST_LIB_DIR)","x") CANTERA_BOOST_LIBS= else CANTERA_BOOST_LIBS= -L$(CANTERA_BOOST_LIB_DIR) -l@BOOST_LIB@ diff --git a/Makefile.in b/Makefile.in index bf901ead9..7fa9e0934 100755 --- a/Makefile.in +++ b/Makefile.in @@ -192,6 +192,8 @@ endif finish-install: @INSTALL@ -d @ct_docdir@ @INSTALL@ -d @ct_bindir@ + cp -f bin/exp3to2.sh "@ct_bindir@" + cp -f bin/csvdiff "@ct_bindir@" ifeq ($(os_is_win),0) # Commands to be executed for non-win systems cp -f License.rtf "@ct_bindir@"