diff options
| author | Andrew Tridgell <tridge@samba.org> | 2011-02-03 13:06:16 +1100 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2011-02-07 13:22:00 +1100 |
| commit | baf629d98f93536d92f4609e79f939d47bd3090f (patch) | |
| tree | 8a0b0883bafa1ebbaa76ef2ddeb2d454d81b9ee6 | |
| parent | 431b25e8953794079ff52155929f0263a833da69 (diff) | |
| download | samba-baf629d98f93536d92f4609e79f939d47bd3090f.tar.gz samba-baf629d98f93536d92f4609e79f939d47bd3090f.tar.bz2 samba-baf629d98f93536d92f4609e79f939d47bd3090f.zip | |
s4-heimdal: allow heimdal build scripts to work from top level
the version_script handling relied on the directory layout. This makes
it independent of the directory structure
Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
| -rw-r--r-- | source4/heimdal_build/wscript_build | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/source4/heimdal_build/wscript_build b/source4/heimdal_build/wscript_build index 77f6a541a5..a1bd4783b0 100644 --- a/source4/heimdal_build/wscript_build +++ b/source4/heimdal_build/wscript_build @@ -12,8 +12,11 @@ def to_list(str): return str return str.split(None) -def heimdal_path(p): - return os.path.join("../heimdal", p) +def heimdal_path(p, absolute=False): + hpath = os.path.join("../heimdal", p) + if not absolute: + return hpath + return os.path.normpath(os.path.join(bld.curdir, hpath)) def heimdal_paths(ps): return [heimdal_path(p) for p in to_list(ps)] @@ -254,7 +257,7 @@ def HEIMDAL_LIBRARY(libname, source, deps, vnum, version_script, includes='', cf ldflags = ldflags, vars = [version], private_library = bundled_build, - version_script = heimdal_path(version_script), + version_script = heimdal_path(version_script, absolute=True), ) |