]>
Commit | Line | Data |
---|---|---|
8f197f49 KG |
1 | diff -Nurpb waf-1.5.18org/waf-light waf-1.5.18/waf-light |
2 | --- waf-1.5.18org/waf-light 2010-07-06 19:50:52.000000000 +0200 | |
3 | +++ waf-1.5.18/waf-light 2010-07-09 00:28:54.000000000 +0200 | |
72464c64 | 4 | @@ -1,4 +1,4 @@ |
7ad647e2 | 5 | -#!/usr/bin/env python |
72464c64 | 6 | +#!/usr/bin/python |
8f197f49 | 7 | # encoding: ISO-8859-1 |
5fe5dafd | 8 | # Thomas Nagy, 2005-2010 |
72464c64 | 9 | |
8f197f49 | 10 | @@ -131,7 +131,7 @@ def find_lib(): |
5cb4610d ER |
11 | if w: return w |
12 | err("waf-light requires wafadmin -> export WAFDIR=/folder") | |
13 | ||
9fdc4a57 | 14 | - dir = "/lib/%s-%s-%s/" % (WAF, VERSION, REVISION) |
15 | + dir = "/lib/waf/" | |
5cb4610d ER |
16 | for i in [INSTALL,'/usr','/usr/local','/opt']: |
17 | w = test(i+dir) | |
18 | if w: return w | |
8f197f49 KG |
19 | diff -Nurpb waf-1.5.18org/wscript waf-1.5.18/wscript |
20 | --- waf-1.5.18org/wscript 2010-07-06 19:50:52.000000000 +0200 | |
21 | +++ waf-1.5.18/wscript 2010-07-09 00:31:03.000000000 +0200 | |
22 | @@ -340,7 +340,7 @@ def build(bld): | |
7ad647e2 | 23 | if val != True and val != "y": sys.exit(1) |
24 | create_waf() | |
25 | ||
26 | - dir = os.path.join('lib', 'waf-%s-%s' % (VERSION, REVISION), 'wafadmin') | |
27 | + dir = os.path.join('lib', 'waf', 'wafadmin') | |
28 | ||
8f197f49 | 29 | wafadmin = bld(features = 'py') |
7ad647e2 | 30 | wafadmin.find_sources_in_dirs('wafadmin', exts=['.py']) |