diff -Naur waf-1.5.15/waf-light waf-1.5.15.tpg//waf-light
--- waf-1.5.15/waf-light	2010-03-28 19:49:02.000000000 +0000
+++ waf-1.5.15.tpg//waf-light	2010-04-05 11:35:39.000000000 +0000
@@ -127,7 +127,7 @@
 		if w: return w
 		err("waf-light requires wafadmin -> export WAFDIR=/folder")
 
-	dir = "/lib/%s-%s-%s/" % (WAF, VERSION, REVISION)
+	dir = "/share/%s/" % (WAF)
 	for i in [INSTALL,'/usr','/usr/local','/opt']:
 		w = test(i+dir)
 		if w: return w
diff -Naur waf-1.5.15/wscript waf-1.5.15.tpg//wscript
--- waf-1.5.15/wscript	2010-03-28 19:49:02.000000000 +0000
+++ waf-1.5.15.tpg//wscript	2010-04-05 11:36:31.000000000 +0000
@@ -313,7 +313,7 @@
 		if val != True and val != "y": sys.exit(1)
 		create_waf()
 
-	dir = os.path.join('lib', 'waf-%s-%s' % (VERSION, REVISION), 'wafadmin')
+	dir = os.path.join('share', 'waf', 'wafadmin')
 
 	wafadmin = bld(features = 'py')
 	wafadmin.find_sources_in_dirs('wafadmin', exts=['.py'])