/[ascend]/trunk/SConstruct
ViewVC logotype

Diff of /trunk/SConstruct

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 2082 by jpye, Mon Sep 21 15:21:06 2009 UTC revision 2083 by jpye, Thu Sep 24 06:37:53 2009 UTC
# Line 112  elif platform.system()=="Darwin": Line 112  elif platform.system()=="Darwin":
112      default_install_prefix = ''      default_install_prefix = ''
113      default_install_bin = "$INSTALL_PREFIX/Applications/ASCEND.app/Contents"      default_install_bin = "$INSTALL_PREFIX/Applications/ASCEND.app/Contents"
114      default_install_lib = "$INSTALL_BIN"      default_install_lib = "$INSTALL_BIN"
115      default_install_models = "$INSTALL_PREFIX/Library/ASCEND/Models"      #default_install_models = "$INSTALL_PREFIX/Library/Application Support/ASCEND/Models"
116      default_install_solvers = "$INSTALL_PREFIX/Library/ASCEND/Solvers"      default_install_models = "$INSTALL_BIN/Models"
117        #default_install_solvers = "$INSTALL_PREFIX/Library/Application Support/ASCEND/Solvers"
118        default_install_solvers = "$INSTALL_BIN/Solvers"
119      default_install_include = "$INSTALL_BIN/Headers"      default_install_include = "$INSTALL_BIN/Headers"
120      default_install_ascdata = "$INSTALL_BIN/Resources"      default_install_ascdata = "$INSTALL_BIN/Resources"
121      default_install_python = "$INSTALL_BIN/Python"      default_install_python = "$INSTALL_BIN/Python"
   
     # still need to work out the Tcl/Tk side of things...  
122      default_install_assets = "$INSTALL_ASCDATA/glade/"      default_install_assets = "$INSTALL_ASCDATA/glade/"
123        # FIXME still need to work out the Tcl/Tk side of things...
124    
125      # within the bundle, we'll use relative paths      # within the bundle, we'll use relative paths
126      default_absolute_paths = False      default_absolute_paths = False
# Line 127  elif platform.system()=="Darwin": Line 128  elif platform.system()=="Darwin":
128      default_tk_rel_dist = 'tcltk'      default_tk_rel_dist = 'tcltk'
129    
130      # we want these to be in /Library/ASCEND/Models and /Library/ASCEND/Solvers      # we want these to be in /Library/ASCEND/Models and /Library/ASCEND/Solvers
131      default_library_rel_dist = '../../Library/ASCEND/Models'      default_library_rel_dist = 'Models'
132      default_solvers_rel_dist = '../../Library/ASCEND/Solvers'      default_solvers_rel_dist = 'Solvers'
133    
134      # where to look for CONOPT when compiling      # where to look for CONOPT when compiling
135      default_conopt_prefix = "/Library/CONOPT"      default_conopt_prefix = "/Library/CONOPT"

Legend:
Removed from v.2082  
changed lines
  Added in v.2083

john.pye@anu.edu.au
ViewVC Help
Powered by ViewVC 1.1.22