diff options
| author | Andrew Tridgell <tridge@samba.org> | 2011-02-07 15:03:26 +1100 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2011-02-07 05:49:58 +0100 |
| commit | 4d3de16b8b9e69408582ea9aa995b44b7a1e83f4 (patch) | |
| tree | 4c85d1724ca30f95c989c4c3e9d32787801a45cd | |
| parent | 2e520ca91180920e4c8b71be4eaa7fabb56d2a12 (diff) | |
| download | samba-4d3de16b8b9e69408582ea9aa995b44b7a1e83f4.tar.gz samba-4d3de16b8b9e69408582ea9aa995b44b7a1e83f4.tar.bz2 samba-4d3de16b8b9e69408582ea9aa995b44b7a1e83f4.zip | |
s4-build: fixed uses of os.path.relpath()
these should be os_path_relpath() to support older python versions.
This should fix the build on FreeBSD 7.2
Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
Autobuild-User: Andrew Tridgell <tridge@samba.org>
Autobuild-Date: Mon Feb 7 05:49:58 CET 2011 on sn-devel-104
| -rw-r--r-- | buildtools/wafsamba/samba_dist.py | 4 | ||||
| -rw-r--r-- | source4/dynconfig/wscript | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/buildtools/wafsamba/samba_dist.py b/buildtools/wafsamba/samba_dist.py index d2be291703..a11a37cc1b 100644 --- a/buildtools/wafsamba/samba_dist.py +++ b/buildtools/wafsamba/samba_dist.py @@ -80,14 +80,14 @@ def vcs_dir_contents(path): while repo != "/": if os.path.isdir(os.path.join(repo, ".git")): ls_files_cmd = [ 'git', 'ls-files', '--full-name', - os.path.relpath(path, repo) ] + os_path_relpath(path, repo) ] cwd = None env = dict(os.environ) env["GIT_DIR"] = os.path.join(repo, ".git") break elif os.path.isdir(os.path.join(repo, ".bzr")): ls_files_cmd = [ 'bzr', 'ls', '--recursive', '--versioned', - os.path.relpath(path, repo)] + os_path_relpath(path, repo)] cwd = repo env = None break diff --git a/source4/dynconfig/wscript b/source4/dynconfig/wscript index 6cebf7ee7f..50ae44f9ad 100644 --- a/source4/dynconfig/wscript +++ b/source4/dynconfig/wscript @@ -1,7 +1,7 @@ #!/usr/bin/env python import string, Utils, Options, sys, Build, os -from samba_utils import EXPAND_VARIABLES +from samba_utils import EXPAND_VARIABLES, os_path_relpath # list of directory options to offer in configure dir_options = { @@ -145,6 +145,6 @@ def build(bld): bld.SAMBA_SUBSYSTEM('DYNCONFIG', 'dynconfig.c', deps='replace talloc', - public_headers=os.path.relpath(os.path.join(Options.launch_dir, 'version.h'), bld.curdir), + public_headers=os_path_relpath(os.path.join(Options.launch_dir, 'version.h'), bld.curdir), header_path='samba', cflags=cflags) |