summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2011-06-15 13:53:19 +1000
committerAndrew Tridgell <tridge@samba.org>2011-06-15 14:13:07 +1000
commit720da3cb9131d4e3bdd0352538f0c5d52c4655c8 (patch)
tree1c6cb90dac050c38f0568183a67c20a2c5c46d60
parent5d736d87778754de7043d902c7d1d5db1c46cb02 (diff)
downloadsamba-720da3cb9131d4e3bdd0352538f0c5d52c4655c8.tar.gz
samba-720da3cb9131d4e3bdd0352538f0c5d52c4655c8.tar.bz2
samba-720da3cb9131d4e3bdd0352538f0c5d52c4655c8.zip
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
-rw-r--r--buildtools/wafsamba/pkgconfig.py1
-rw-r--r--buildtools/wafsamba/wafsamba.py2
2 files changed, 3 insertions, 0 deletions
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)