build: fixed dependencies on install prefix for pc files and python scripts
authorAndrew Tridgell <tridge@samba.org>
Wed, 15 Jun 2011 03:53:19 +0000 (13:53 +1000)
committerAndrew Tridgell <tridge@samba.org>
Wed, 15 Jun 2011 04:13:07 +0000 (14:13 +1000)
waf can't automatically determine these dependencies as the
construction of the files is via a python function

thanks to Andrew for noticing this bug

buildtools/wafsamba/pkgconfig.py
buildtools/wafsamba/wafsamba.py

index 09bfcb9c6beae581168961f544ad8ffe4dbef351..8a3f807dc5530c1709b6a8653e07b707eacb69b2 100644 (file)
@@ -53,6 +53,7 @@ def PKG_CONFIG_FILES(bld, pc_files, vnum=None):
                                 rule=subst_at_vars,
                                 source=f+'.in',
                                 target=f)
+        bld.add_manual_dependency(bld.path.find_or_declare(f), bld.env['PREFIX'])
         t.vars = []
         if t.env.RPATH_ON_INSTALL:
             t.env.LIB_RPATH = t.env.RPATH_ST % t.env.LIBDIR
index 43b7f616dc7e2cf4f715643fd8f475d4e61fe4a3..d76afc498475074dff85f8cdba4fc8658ae863af 100644 (file)
@@ -692,6 +692,8 @@ def install_file(bld, destdir, file, chmod=MODE_644, flat=False,
                             rule=copy_and_fix_python_path,
                             source=file,
                             target=inst_file)
+        bld.add_manual_dependency(bld.path.find_or_declare(inst_file), bld.env["PYTHONARCHDIR"])
+        bld.add_manual_dependency(bld.path.find_or_declare(inst_file), bld.env["PYTHONDIR"])
         file = inst_file
     if base_name:
         file = os.path.join(base_name, file)