Changeset 1438

Show
Ignore:
Timestamp:
11/16/08 15:17:22 (15 years ago)
Author:
arnonym
Message:

Forward-port r1402 and r1404

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/libffado/support/mixer/ffado-mixer-qt3.in

    • Property svn:mergeinfo set

  • trunk/libffado/support/mixer/SConscript

    r1358 r1438  
    5555    # 
    5656    # For the ffadomixer.in 
    57     e['PYTHONDIR'] = Template( os.path.join( e['SHAREDIR'], 'python' ) ).safe_substitute( e ) 
     57    e['PYTHONDIR'] = Template( os.path.join( e['SHAREDIR'], 'python-qt3' ) ).safe_substitute( e ) 
    5858    # For the installation of the stuff 
    59     e['pythondir'] = Template( os.path.join( e['sharedir'], 'python' ) ).safe_substitute( e ) 
     59    e['pythondir'] = Template( os.path.join( e['sharedir'], 'python-qt3' ) ).safe_substitute( e ) 
    6060 
    6161    for m in e['MIXERGUIS']: 
    …… 
    8181    e.Install( "$pythondir", "ffadomixer_config.py" ) 
    8282 
    83     e.ScanReplace( "ffadomixer.in" ) 
    84     e.Depends( "ffadomixer", "#/config.h" ) 
    85     e.Depends( "ffadomixer", "SConscript" ) 
    86     e.Install( "$bindir", "ffadomixer" ) 
     83    e.ScanReplace( "ffado-mixer3.in" ) 
     84    e.Depends( "ffado-mixer3", "#/config.h" ) 
     85    e.Depends( "ffado-mixer3", "SConscript" ) 
     86    e.Install( "$bindir", "ffado-mixer3" ) 
    8787