diff options
| author | Andrew Tridgell <tridge@samba.org> | 2010-03-19 19:49:59 +1100 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2010-04-06 20:26:54 +1000 |
| commit | 19b6e8b4082e4c4d77eb2515f9f9d8caf20922ae (patch) | |
| tree | 78dddcf8fc59f61697013a5800235872faf3ae3c | |
| parent | 3335ff742493c44ec3bed96778441cc9561044f0 (diff) | |
| download | samba-19b6e8b4082e4c4d77eb2515f9f9d8caf20922ae.tar.gz samba-19b6e8b4082e4c4d77eb2515f9f9d8caf20922ae.tar.bz2 samba-19b6e8b4082e4c4d77eb2515f9f9d8caf20922ae.zip | |
build: use SUBST_VARS_RECURSIVE() for install_path
| -rw-r--r-- | buildtools/wafsamba/wafsamba.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py index f17f1a0c57..e7ea4d3117 100644 --- a/buildtools/wafsamba/wafsamba.py +++ b/buildtools/wafsamba/wafsamba.py @@ -4,6 +4,7 @@ import Build, os, Options, Task, Utils, cc, TaskGen from Configure import conf from Logs import debug +from samba_utils import SUBST_VARS_RECURSIVE # bring in the other samba modules from samba_optimisation import * @@ -118,7 +119,8 @@ def SAMBA_LIBRARY(bld, libname, source, ) if install_path is None: - install_path = '${PREFIX}/lib' + install_path = '${LIBDIR}' + install_path = SUBST_VARS_RECURSIVE(install_path, bld.env) if install: # create a separate install library, which may have @@ -224,7 +226,8 @@ def SAMBA_BINARY(bld, binname, source, ) if install_path is None: - install_path = '${PREFIX}/bin' + install_path = '${BINDIR}' + install_path = SUBST_VARS_RECURSIVE(install_path, bld.env) if install: # we create a separate 'install' binary, which |