diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2019-11-04 17:07:44 +1300 |
|---|---|---|
| committer | Andreas Schneider <asn@cryptomilk.org> | 2019-11-13 08:42:30 +0000 |
| commit | 92ce387ed0e02bc3ebc673bcfd7ffbb55c04f57d (patch) | |
| tree | 8edc43fb24f980b1665556f111ed638bb8bc957c /dynconfig | |
| parent | dc5788056bcbccdc320aeaad4f35f726632a91a4 (diff) | |
| download | samba-92ce387ed0e02bc3ebc673bcfd7ffbb55c04f57d.tar.gz | |
build: Remove workaround for missing os.path.relpath in Python < 2.6
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: David Mulder <dmulder@suse.com>
Reviewed-by: Andreas Schneider <asn@samba.org>
Diffstat (limited to 'dynconfig')
| -rw-r--r-- | dynconfig/wscript | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/dynconfig/wscript b/dynconfig/wscript index 440ecd7f1b4..f455699f062 100644 --- a/dynconfig/wscript +++ b/dynconfig/wscript @@ -5,7 +5,7 @@ import os import optparse import textwrap from waflib import Logs, Errors, Options, Build, Context -from samba_utils import EXPAND_VARIABLES, os_path_relpath +from samba_utils import EXPAND_VARIABLES class SambaIndentedHelpFormatter (optparse.IndentedHelpFormatter): """Format help with indented section bodies. @@ -425,7 +425,7 @@ def build(bld): bld.SAMBA_SUBSYSTEM('DYNCONFIG', 'dynconfig.c', deps='replace', - public_headers=os_path_relpath(os.path.join(Context.launch_dir, version_header), bld.path.abspath()), + public_headers=os.path.relpath(os.path.join(Context.launch_dir, version_header), bld.path.abspath()), header_path='samba', cflags=cflags) |