Changeset 606

Show
Ignore:
Timestamp:
08/30/07 14:09:35 (15 years ago)
Author:
ppalmers
Message:

proposed fix for ticket #30

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/libffado/SConstruct

    r605 r606  
    55sys.path.append( "./admin" ) 
    66from pkgconfig import * 
     7from string import Template 
    78 
    89build_dir = ARGUMENTS.get('BUILDDIR', "") 
    …… 
    183184# XXX: Maybe we can even drop these lower-case variables and only use the uppercase ones? 
    184185# 
    185 env['bindir'] = os.path.join( env['BINDIR'] ) 
    186 env['libdir'] = os.path.join( env['LIBDIR'] ) 
    187 env['includedir'] = os.path.join( env['INCLUDEDIR'] ) 
    188 env['sharedir'] = os.path.join( env['SHAREDIR'] ) 
     186env['bindir'] = Template( os.path.join( env['BINDIR'] ) ).safe_substitute( env ) 
     187env['libdir'] = Template( os.path.join( env['LIBDIR'] ) ).safe_substitute( env ) 
     188env['includedir'] = Template( os.path.join( env['INCLUDEDIR'] ) ).safe_substitute( env ) 
     189env['sharedir'] = Template( os.path.join( env['SHAREDIR'] ) ).safe_substitute( env ) 
    189190env['cachedir'] = os.path.join( env['PREFIX'], "var/cache/libffado" ) 
    190191