svn commit: samba r26289 - in branches/SAMBA_4_0/source/build/smb_build: .

metze at samba.org metze at samba.org
Tue Dec 4 14:17:27 GMT 2007


Author: metze
Date: 2007-12-04 14:17:26 +0000 (Tue, 04 Dec 2007)
New Revision: 26289

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=26289

Log:
build: avoid nasty foo/./bla pathes for python stuff

metze
Modified:
   branches/SAMBA_4_0/source/build/smb_build/input.pm


Changeset:
Modified: branches/SAMBA_4_0/source/build/smb_build/input.pm
===================================================================
--- branches/SAMBA_4_0/source/build/smb_build/input.pm	2007-12-04 13:19:21 UTC (rev 26288)
+++ branches/SAMBA_4_0/source/build/smb_build/input.pm	2007-12-04 14:17:26 UTC (rev 26289)
@@ -158,9 +158,12 @@
 		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;



More information about the samba-cvs mailing list