From e7279ac7c1e8a79f8c667437aeb8b9fa9c255488 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Tue, 4 Dec 2007 14:17:26 +0100
Subject: r26289: build: avoid nasty foo/./bla pathes for python stuff

metze
(This used to be commit 59469088e70581e33a83a8e26bec879ecdc7ded4)
---
 source4/build/smb_build/input.pm | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'source4/build')

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;
-- 
cgit