diff -up waf-1.4.2/waf-light.libdir waf-1.4.2/waf-light
--- waf-1.4.2/waf-light.libdir	2008-05-17 14:24:37.000000000 +0200
+++ waf-1.4.2/waf-light	2008-05-26 08:56:47.000000000 +0200
@@ -109,7 +109,7 @@ def find_lib():
 		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
diff -up waf-1.4.2/wscript.libdir waf-1.4.2/wscript
--- waf-1.4.2/wscript.libdir	2008-05-17 14:24:37.000000000 +0200
+++ waf-1.4.2/wscript	2008-05-26 08:56:47.000000000 +0200
@@ -301,7 +301,7 @@ def install_waf():
 		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'))