summaryrefslogtreecommitdiff
path: root/net/xorp/files/patch-SConstruct
blob: 826dc700564dce3e0fccab9b4d7474d73eb44280 (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
--- ./SConstruct.orig	2012-01-11 17:46:45.000000000 +0000
+++ ./SConstruct	2014-02-26 21:17:13.000000000 +0000
@@ -162,22 +162,13 @@
 
 # XXX TODO: Make initial CPPPATH/LIBPATH derive from
 # autodetected host system *or* command line.
-#env = Environment(
-#		  TOOLS = ['default', 'autotest', 'clntgen', 'tgtgen',
-#		           'TOOL_SUBST'],
-#		  ENV = os.environ,
-#		  BUILDDIR = builddir,
-#		  CPPPATH=['/usr/local/include', '$BUILDDIR'],
-#		  LIBPATH=['usr/lib', '/usr/local/lib'],
-#		  variables = vars)
-
 env = Environment(
 		  TOOLS = ['default', 'autotest', 'clntgen', 'tgtgen',
 		           'TOOL_SUBST'],
 		  ENV = os.environ,
 		  BUILDDIR = builddir,
-		  CPPPATH=['$BUILDDIR'],
-		  LIBPATH=['usr/lib'],
+		  CPPPATH=['%%LOCALBASE%%/include', '$BUILDDIR'],
+		  LIBPATH=['usr/lib', '%%LOCALBASE%%/lib'],
 		  variables = vars)
 
 prefix = env['prefix']