/[ascend]/trunk/SConstruct
ViewVC logotype

Diff of /trunk/SConstruct

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

revision 454 by johnpye, Wed Apr 5 06:47:01 2006 UTC revision 455 by johnpye, Wed Apr 5 07:50:22 2006 UTC
# Line 181  opts.Add( Line 181  opts.Add(
181      ,"$INSTALL_PREFIX/include"      ,"$INSTALL_PREFIX/include"
182  )  )
183    
184    if platform.system()=="Windows":
185        default_install_assets = "glade/"
186        icon_extension = '.png'
187    else:
188        default_install_assets = "$INSTALL_DATA/ascend/glade/"
189        icon_extension = '.svg'
190    
191    opts.Add(
192        'PYGTK_ASSETS'
193        ,'Default location for Glade assets (placed in pygtk/interface/config.py)'
194        ,default_install_assets
195    )
196    
197  opts.Add(  opts.Add(
198      'INSTALL_ROOT'      'INSTALL_ROOT'
199      ,'For use by RPM only: location of %{buildroot} during rpmbuild'      ,'For use by RPM only: location of %{buildroot} during rpmbuild'
# Line 215  subst_dict = { Line 228  subst_dict = {
228      '@WEBHELPROOT@':'http://pye.dyndns.org/ascend/manual/'      '@WEBHELPROOT@':'http://pye.dyndns.org/ascend/manual/'
229      , '@GLADE_FILE@':'ascend.glade'      , '@GLADE_FILE@':'ascend.glade'
230      , '@DEFAULT_ASCENDLIBRARY@':env['DEFAULT_ASCENDLIBRARY']      , '@DEFAULT_ASCENDLIBRARY@':env['DEFAULT_ASCENDLIBRARY']
231      , '@ASCEND_ICON@':'ascend.png'      , '@ICON_EXTENSION@':icon_extension
232      , '@HELP_ROOT@':''      , '@HELP_ROOT@':''
233      , '@INSTALL_DATA@':env['INSTALL_DATA']      , '@INSTALL_DATA@':env['INSTALL_DATA']
234      , '@INSTALL_BIN@':env['INSTALL_BIN']      , '@INSTALL_BIN@':env['INSTALL_BIN']
235      , '@INSTALL_INCLUDE@':env['INSTALL_INCLUDE']      , '@INSTALL_INCLUDE@':env['INSTALL_INCLUDE']
236        , '@PYGTK_ASSETS@':env['PYGTK_ASSETS']
237      , '@VERSION@':version      , '@VERSION@':version
238  }  }
239    

Legend:
Removed from v.454  
changed lines
  Added in v.455

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