Utils: Refactor hexdump() helper to move code out of template function

[senf.git] / senfscons / senfutil.py

diff --git a/senfscons/senfutil.py b/senfscons/senfutil.py
index 2e537d8..c3ef1b2 100644 (file)
--- a/senfscons/senfutil.py
+++ b/senfscons/senfutil.py
@@ -8,7 +8,9 @@ from SCons.Script import *
 # c) check for a local SENF, set options accordingly and update that SENF if needed
 
 def SetupForSENF(env):
-    env.Append( LIBS           = [ 'senf', 'iberty', 'boost_regex', 'boost_iostreams' ],
+    env.Append( LIBS           = [ 'senf', '$BOOSTREGEXLIB', '$BOOSTIOSTREAMSLIB' ],
+                BOOSTREGEXLIB  = 'boost_regex',
+                BOOSTIOSTREAMSLIB = 'boost_iostreams',
                 CXXFLAGS       = [ '-Wno-long-long',
                                    '${"$CXXFLAGS_"+(final and "final" or "debug")}' ],
                 LINKFLAGS      = [ '${"$LINKFLAGS_"+(final and "final" or "debug")}' ],
@@ -52,6 +54,6 @@ def SetupForSENF(env):
 
         env.Default(
             env.AlwaysBuild(
-                env.Command('senf/libsenf.a', [],  [ 'scons -C senf $SENF_BUILDOPTS libsenf.a' ])))
+                env.Command('senf/libsenf.a', [],  [ 'scons -C %s $SENF_BUILDOPTS libsenf.a' % os.path.realpath('senf')])))
     else:
         print '\nUsing global SENF\n'