research/cantera
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed an error in Cantera.mak that appears just for macs.

Browse source 
added a couple more files to the install procedure that were missing.
This commit is contained in:
Harry Moffat 2009-08-22 22:47:38 +00:00
parent 060c73d5ad
commit b93bd3bb2f
3 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Cantera/cxx/include/Cantera.mak.in
View file

@ -56,15 +56,15 @@ CANTERA_CORE_LIBS_DEP= @CANTERA_CORE_LIBS_DEP@ $(CANTERA_LIBSDIR)/libctcxx.a
# #
# Cantera Boost Include # Cantera Boost Include
# #
CANTERA_BOOST_INCLUDES= @BOOST_INCLUDE@ CANTERA_BOOST_INCLUDES=@BOOST_INCLUDE@
# #
# Location of the boost library that Cantera linked against # 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 # Linkage extras for linking against boost
# #
ifeq ($(CANTERA_BOOST_LIB_DIR),"") ifeq ("x$(CANTERA_BOOST_LIB_DIR)","x")
CANTERA_BOOST_LIBS= CANTERA_BOOST_LIBS=
else else
CANTERA_BOOST_LIBS= -L$(CANTERA_BOOST_LIB_DIR) -l@BOOST_LIB@ CANTERA_BOOST_LIBS= -L$(CANTERA_BOOST_LIB_DIR) -l@BOOST_LIB@

2
Cantera/cxx/include/Cantera_bt.mak.in
View file

@ -64,7 +64,7 @@ CANTERA_BOOST_LIB_DIR= @BOOST_LIB_DIR@
# #
# Linkage extras for linking against boost # Linkage extras for linking against boost
# #
ifeq ($(CANTERA_BOOST_LIB_DIR),"") ifeq ("x$(CANTERA_BOOST_LIB_DIR)","x")
CANTERA_BOOST_LIBS= CANTERA_BOOST_LIBS=
else else
CANTERA_BOOST_LIBS= -L$(CANTERA_BOOST_LIB_DIR) -l@BOOST_LIB@ CANTERA_BOOST_LIBS= -L$(CANTERA_BOOST_LIB_DIR) -l@BOOST_LIB@

2
Makefile.in
View file

@ -192,6 +192,8 @@ endif
finish-install: finish-install:
@INSTALL@ -d @ct_docdir@ @INSTALL@ -d @ct_docdir@
@INSTALL@ -d @ct_bindir@ @INSTALL@ -d @ct_bindir@
cp -f bin/exp3to2.sh "@ct_bindir@"
cp -f bin/csvdiff "@ct_bindir@"
ifeq ($(os_is_win),0) ifeq ($(os_is_win),0)
# Commands to be executed for non-win systems # Commands to be executed for non-win systems
cp -f License.rtf "@ct_bindir@" cp -f License.rtf "@ct_bindir@"