/[ascend]/trunk/SConstruct
ViewVC logotype

Diff of /trunk/SConstruct

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

revision 2073 by jpye, Thu Sep 3 13:23:46 2009 UTC revision 2075 by jpye, Mon Sep 7 12:09:59 2009 UTC
# Line 28  default_install_solvers = "$INSTALL_LIB/ Line 28  default_install_solvers = "$INSTALL_LIB/
28  default_install_assets = "$INSTALL_ASCDATA/glade/"  default_install_assets = "$INSTALL_ASCDATA/glade/"
29  default_install_ascdata = "$INSTALL_SHARE/ascend"  default_install_ascdata = "$INSTALL_SHARE/ascend"
30  default_install_include = "$INSTALL_PREFIX/include"  default_install_include = "$INSTALL_PREFIX/include"
31    default_install_python = os.path.join(distutils.sysconfig.get_python_lib(),"ascend")
32    
33  default_tcl = '/usr'  default_tcl = '/usr'
34  default_tcl_libpath = "$TCL/lib"  default_tcl_libpath = "$TCL/lib"
# Line 101  if platform.system()=="Windows": Line 102  if platform.system()=="Windows":
102            
103      default_fortran="g77"      default_fortran="g77"
104      default_f2c_lib="g2c"      default_f2c_lib="g2c"
     default_python = distutils.sysconfig.get_python_lib()  
105            
106      soname_minor = ""      soname_minor = ""
107      soname_major = ""      soname_major = ""
# Line 109  if platform.system()=="Windows": Line 109  if platform.system()=="Windows":
109    
110  elif platform.system()=="Darwin":  elif platform.system()=="Darwin":
111    
112      default_install_prefix = '/'      default_install_prefix = ''
113      default_install_bin = "$INSTALL_PREFIX/Applications/ASCEND"      default_install_bin = "$INSTALL_PREFIX/Applications/ASCEND"
114      default_install_lib = "$INSTALL_PREFIX/Applications/ASCEND"      default_install_lib = "$INSTALL_PREFIX/Applications/ASCEND"
115      default_install_models = "$INSTALL_PREFIX/Library/ASCEND/Models"      default_install_models = "$INSTALL_PREFIX/Library/ASCEND/Models"
116      default_install_solvers = "$INSTALL_PREFIX/Library/ASCEND/Solvers"      default_install_solvers = "$INSTALL_PREFIX/Library/ASCEND/Solvers"
117      default_install_include = "$INSTALL_PREFIX/Applications/ASCEND/Headers"      default_install_include = "$INSTALL_PREFIX/Applications/ASCEND/Headers"
118      default_install_ascdata = "$INSTALL_PREFIX/Applications/ASCEND/Resources"      default_install_ascdata = "$INSTALL_PREFIX/Applications/ASCEND/Resources"
119        default_install_python = "$INSTALL_BIN/Python"
120    
121      # still need to work out the Tcl/Tk side of things...      # still need to work out the Tcl/Tk side of things...
122      default_install_assets = "$INSTALL_ASCDATA/glade/"      default_install_assets = "$INSTALL_ASCDATA/glade/"
# Line 143  elif platform.system()=="Darwin": Line 144  elif platform.system()=="Darwin":
144      default_with_scrollkeeper=False      default_with_scrollkeeper=False
145      pathsep = ";"      pathsep = ";"
146            
     default_python = distutils.sysconfig.get_python_lib()  
147            
148  else: # LINUX  else: # LINUX
149    
150      icon_extension = '.svg'      icon_extension = '.svg'
     default_python = distutils.sysconfig.get_python_lib()  
151    
152      if os.path.exists("/etc/debian_version"):      if os.path.exists("/etc/debian_version"):
153          default_tcl_cpppath = "/usr/include/tcl8.4"          default_tcl_cpppath = "/usr/include/tcl8.4"
# Line 671  opts.Add( Line 670  opts.Add(
670  opts.Add(  opts.Add(
671      'INSTALL_PYTHON'      'INSTALL_PYTHON'
672      ,'Common shared-file location on this system'      ,'Common shared-file location on this system'
673      ,os.path.join(default_python,"ascend")      ,default_install_python
674  )  )
675    
676  opts.Add(  opts.Add(

Legend:
Removed from v.2073  
changed lines
  Added in v.2075

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