--- waf-light.libdir	2008-05-04 16:54:14.000000000 +0200
+++ waf-light	2008-05-04 18:25:13.000000000 +0200
@@ -109,7 +109,7 @@
 		if w: return w
 		err("waf-light requires wafadmin -> export WAFDIR=/folder")
 
-	dir = "/lib/waf-%s-%s/" % (VERSION, REVISION)
+	dir = "/share/waf/"
 	for i in [INSTALL,'/usr','/usr/local','/opt']:
 		w = test(i+dir)
 		if w: return w
--- wscript.libdir	2008-05-04 16:54:14.000000000 +0200
+++ wscript	2008-05-04 18:25:13.000000000 +0200
@@ -295,7 +295,7 @@
 		prefix = Params.g_options.prefix
 
 	binpath     = os.path.join(prefix, 'bin%swaf' % os.sep)
-	wafadmindir = os.path.join(prefix, 'lib%swaf-%s-%s%swafadmin%s' % (os.sep, VERSION, REVISION, os.sep, os.sep))
+	wafadmindir = os.path.join(prefix, 'share%swaf%swafadmin%s' % (os.sep, os.sep, os.sep))
 	toolsdir    = os.path.join(wafadmindir, 'Tools' + os.sep)
 
 	try: os.makedirs(os.path.join(prefix, 'bin'))