[Xorp-hackers] [PATCH3/3] main SConstract bugs

["Igor Maravić"]

> On 09/23/2011 06:43 AM, "Igor Maravić" wrote:
>> When I did "scons install" rtrmngr was looking for .xrls files in folder /xrl/targets not in folder /xorp/xrls, so I changed that.
>> Also I removed ; from if statements.
>> Also only when value of 'optimize' is set to 'override', we should skip appending CFLAGS/CXXFLAGS.
>> When it's value is 'no', CFLAGS/CXXFLAGS still have some value to be appended.
>
> Please break this into 3 different patches for these 3 different
> things.
>
> For the .xrls part, what error did you see?  I don't see
> any trouble with 'scons install' on my systems.  What command
> are you using for the compile?
>
> Thanks,
> Ben
>
> --
> Ben Greear <greearb at candelatech.com>
> Candela Technologies Inc  http://www.candelatech.com
>
>

When I did "scons install debug_xrldb=True" rtrmngr was looking for .xrls files in folder
/xrl/targets not in folder /xorp/xrls, so I changed that.

This is the error when I run /usr/local/xorp/sbin/xorp_rtrmgr

[ 2011/09/26 10:54:08.836134  ERROR xorp_rtrmgr:13960 RTRMGR rtrmgr/main_rtrmgr.cc:260 run ]
Shutting down due to an init error: Error reading XRL directory /usr/local/xorp/share/xorp/xrl/targets: No such file or directory


Signed-off-by: Igor Maravić<igorm at etf.rs>
---

--- xorp/SConstruct.orig	2011-09-26 10:43:15.000000000 +0200
+++ xorp/SConstruct	2011-09-26 10:57:02.125919777 +0200
@@ -379,7 +379,7 @@ env['xorp_moduledir']   = env['libdir']
 env['xorp_sbindir']     = env['sbindir']		# End-user binaries
 env['xorp_templatedir'] = env['datadir'] + '/templates'
 env['xorp_tooldir']     = env['libdir']  + '/xorp/bin'	# tools/*
-env['xorp_xrlsdir']     = env['datadir'] + '/xorp/xrls'	# *.xrls
+env['xorp_xrlsdir']     = env['datadir'] + '/xrl/targets'	# *.xrls
 env['xorp_sourcedir']   = sourcedir	# rtrmgr/util.cc and xif need this

 tst = ARGUMENTS.get('enable_boost', False)