[Xorp-hackers] [PATCH] xorp: contrib: olsr: tools: Add missing RPATH to SConscript
igorm at etf.rs
igorm at etf.rs
Wed Feb 29 09:02:25 PST 2012
From: Igor Maravic <igorm at etf.rs>
With this parameter olsr_{print, clear}_databases can link needed libraries.
Reported-by: James Mccracken <mccrajs at tigermail.auburn.edu>
Signed-off-by: Igor Maravic <igorm at etf.rs>
---
xorp/contrib/olsr/tools/SConscript | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/xorp/contrib/olsr/tools/SConscript b/xorp/contrib/olsr/tools/SConscript
index 6e63a71..7f0557e 100644
--- a/xorp/contrib/olsr/tools/SConscript
+++ b/xorp/contrib/olsr/tools/SConscript
@@ -38,7 +38,7 @@ env.AppendUnique(LIBPATH = [
'$BUILDDIR/libproto',
'$BUILDDIR/xrl/interfaces',
'$BUILDDIR/xrl/targets',
- '$BUILDDIR/.',
+ '.',
])
env.AppendUnique(LIBS = [
@@ -70,6 +70,10 @@ if (env.has_key('mingw') and env['mingw']):
env.Append(LIBS = ['xorp_core'])
+env.Replace(RPATH = [
+ env.Literal(env['xorp_tool_rpath'])
+])
+
cleardbsrcs = [
'clear_database.cc'
]
@@ -96,4 +100,3 @@ env.Alias('install', env.InstallProgram(env['xorp_tooldir'], cleardb))
env.Alias('install', env.InstallProgram(env['xorp_tooldir'], printdb))
Default(cleardb, printdb)
-Default()
--
1.7.5.4
More information about the Xorp-hackers
mailing list