summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2007-12-04 14:17:26 +0100
committerStefan Metzmacher <metze@samba.org>2007-12-21 05:48:10 +0100
commite7279ac7c1e8a79f8c667437aeb8b9fa9c255488 (patch)
treeeb0702fc1e588de420bc81bdf2302031ae5bf958
parentfb3877df0b834dcb180dac639856c80a0c2bb5b9 (diff)
downloadsamba-e7279ac7c1e8a79f8c667437aeb8b9fa9c255488.tar.gz
samba-e7279ac7c1e8a79f8c667437aeb8b9fa9c255488.tar.bz2
samba-e7279ac7c1e8a79f8c667437aeb8b9fa9c255488.zip
r26289: build: avoid nasty foo/./bla pathes for python stuff
metze (This used to be commit 59469088e70581e33a83a8e26bec879ecdc7ded4)
-rw-r--r--source4/build/smb_build/input.pm7
1 files changed, 5 insertions, 2 deletions
diff --git a/source4/build/smb_build/input.pm b/source4/build/smb_build/input.pm
index 57e2234c02..aa34be4b94 100644
--- a/source4/build/smb_build/input.pm
+++ b/source4/build/smb_build/input.pm
@@ -158,9 +158,12 @@ sub check_python($$)
my $dirname = dirname($python->{SWIG_FILE});
my $basename = basename($python->{SWIG_FILE}, ".i");
- $python->{OBJ_FILES} = ["$dirname/$basename\_wrap.o"];
+ $dirname .= "/" unless $dirname =~ /\/$/;
+ $dirname = "" if $dirname eq "./";
+
+ $python->{OBJ_FILES} = ["$dirname$basename\_wrap.o"];
$python->{LIBRARY_REALNAME} = "_$basename.\$(SHLIBEXT)";
- $python->{PYTHON_FILES} = ["$dirname/$basename.py"];
+ $python->{PYTHON_FILES} = ["$dirname$basename.py"];
} else {
my $basename = $python->{NAME};
$basename =~ s/^python_//g;