build: updates to waf scripts for replace and talloc

[ira/wip.git] / lib / replace / wscript

diff --git a/lib/replace/wscript b/lib/replace/wscript
index 45ce6cddf69bbe668b3f9739018a2585a2b8be6a..6baab09b03aadd7b60a93d2fece491fcddbcde54 100644 (file)
--- a/lib/replace/wscript
+++ b/lib/replace/wscript
@@ -13,8 +13,7 @@ def configure(conf):
     conf.env.hlist = []
 
     # load our local waf extensions
-    conf.check_tool('autoconf', tooldir='. ../replace')
-    conf.check_rpath()
+    conf.check_tool('autoconf', tooldir=conf.curdir)
 
     conf.check_tool('compiler_cc')
     conf.DEFUN('_GNU_SOURCE', 1)
@@ -114,12 +113,14 @@ main() { foo("hello"); }
     conf.write_config_header('config.h')
 
 def build(bld):
+    bld.set_rpath()
+
     # the libreplace shared library
     bld(
         features = 'cc cshlib',
         source = 'replace.c',
         target='replace',
-        includes = '. default /usr/include')
+        includes = '. default')
 
     # test program
     bld(