From 720da3cb9131d4e3bdd0352538f0c5d52c4655c8 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Wed, 15 Jun 2011 13:53:19 +1000 Subject: build: fixed dependencies on install prefix for pc files and python scripts 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 | 1 + buildtools/wafsamba/wafsamba.py | 2 ++ 2 files changed, 3 insertions(+) (limited to 'buildtools') diff --git a/buildtools/wafsamba/pkgconfig.py b/buildtools/wafsamba/pkgconfig.py index 09bfcb9c6b..8a3f807dc5 100644 --- a/buildtools/wafsamba/pkgconfig.py +++ b/buildtools/wafsamba/pkgconfig.py @@ -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 diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py index 43b7f616dc..d76afc4984 100644 --- a/buildtools/wafsamba/wafsamba.py +++ b/buildtools/wafsamba/wafsamba.py @@ -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) -- cgit