Changeset 1301

Show
Ignore:
Timestamp:
07/16/08 04:46:20 (13 years ago)
Author:
ppalmers
Message:

fix build system issues with new config system

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • branches/libffado-2.0/SConstruct

    r1298 r1301  
    531531env.Install( env['libdir'] + '/pkgconfig', pkgconfig ) 
    532532 
    533 env.Install( env['SYSTEM_CONFIG_FILE'], 'configuration' ) 
     533env.Install( env['SHAREDIR'], 'configuration' ) 
    534534 
    535535subdirs=['external','src','libffado','tests','support','doc'] 
  • branches/libffado-2.0/src/SConscript

    r1299 r1301  
    190190 
    191191# add the libconfig 
    192 env.AppendUnique( CPPPATH=["#/external/libconfig"] ) 
    193 env.PrependUnique( LIBPATH=[env['build_base']+"external/libconfig"] ) 
    194 env.PrependUnique( LIBS=["libconfigpp"] ) 
     192libenv.AppendUnique( CPPPATH=["#/external/libconfig"] ) 
     193libenv.PrependUnique( LIBPATH=[env['build_base']+"external/libconfig"] ) 
     194libenv.PrependUnique( LIBS=["libconfigpp"] ) 
    195195 
    196196#env1.AppendUnique( LINKFLAGS = env.Split("-Wl,-rpath $libdir -Wl,-soname -Wl,libffado.so.1 --version-info=1:0:0") )