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

[jelmer at samba.org]

Author: jelmer
Date: 2006-03-16 11:41:12 +0000 (Thu, 16 Mar 2006)
New Revision: 14469

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

Log:
Don't the variable INSTALLDIR for two different things...

Modified:
   branches/SAMBA_4_0/source/build/smb_build/makefile.pm
   branches/SAMBA_4_0/source/build/smb_build/output.pm


Changeset:
Modified: branches/SAMBA_4_0/source/build/smb_build/makefile.pm
===================================================================
--- branches/SAMBA_4_0/source/build/smb_build/makefile.pm	2006-03-16 11:32:01 UTC (rev 14468)
+++ branches/SAMBA_4_0/source/build/smb_build/makefile.pm	2006-03-16 11:41:12 UTC (rev 14469)
@@ -206,15 +206,15 @@
 	my $init_obj = "";
 	
 	if ($self->{duplicate_build}) {
-		$installdir = $ctx->{INSTALLDIR};
+		$installdir = $ctx->{RELEASEDIR};
 	} else {
-		$installdir = $ctx->{BUILDDIR};
+		$installdir = $ctx->{DEBUGDIR};
 	}
 
 	if ($ctx->{TYPE} eq "LIBRARY") {
-		push (@{$self->{shared_libs}}, "$ctx->{BUILDDIR}/$ctx->{LIBRARY_REALNAME}");
+		push (@{$self->{shared_libs}}, "$ctx->{DEBUDRI}/$ctx->{LIBRARY_REALNAME}");
 	} elsif ($ctx->{TYPE} eq "MODULE") {
-		push (@{$self->{shared_modules}}, "$ctx->{BUILDDIR}/$ctx->{LIBRARY_REALNAME}");
+		push (@{$self->{shared_modules}}, "$ctx->{DEBUGDIR}/$ctx->{LIBRARY_REALNAME}");
 		push (@{$self->{plugins}}, "$installdir/$ctx->{LIBRARY_REALNAME}");
 
 		my $fixedname = $ctx->{NAME};
@@ -269,7 +269,7 @@
 
 $ctx->{TARGET}: \$($ctx->{TYPE}_$ctx->{NAME}_DEPEND_LIST) \$($ctx->{TYPE}_$ctx->{NAME}_OBJ_LIST) $init_obj
 	\@echo Linking \$\@
-	\@mkdir -p $ctx->{BUILDDIR}
+	\@mkdir -p $ctx->{DEBUGDIR}
 	\@\$(SHLD) \$(SHLD_FLAGS) -o \$\@ \$(LOCAL_LINK_FLAGS) \\
 		\$($ctx->{TYPE}_$ctx->{NAME}_LINK_FLAGS) $soarg \\
 		$init_obj \$($ctx->{TYPE}_$ctx->{NAME}_LINK_LIST)

Modified: branches/SAMBA_4_0/source/build/smb_build/output.pm
===================================================================
--- branches/SAMBA_4_0/source/build/smb_build/output.pm	2006-03-16 11:32:01 UTC (rev 14468)
+++ branches/SAMBA_4_0/source/build/smb_build/output.pm	2006-03-16 11:41:12 UTC (rev 14469)
@@ -58,17 +58,17 @@
 		$lib_name = "lib$link_name";
 	}
 
-	$lib->{BUILDDIR} = "bin";
-	$lib->{INSTALLDIR} = "bin/install";
+	$lib->{DEBUGDIR} = "bin";
+	$lib->{RELEASEDIR} = "bin/install";
 	$lib->{LIBRARY_REALNAME} = $lib->{LIBRARY_NAME} = "$lib_name.\$(SHLIBEXT)";
 
 	if (defined($lib->{VERSION})) {
 		$lib->{LIBRARY_SONAME} = $lib->{LIBRARY_NAME}.".$lib->{SO_VERSION}";
 		$lib->{LIBRARY_REALNAME} = $lib->{LIBRARY_NAME}.".$lib->{VERSION}";
 	} elsif ($lib->{TYPE} eq "MODULE") {
-		$lib->{BUILDDIR} = "bin/modules/$lib->{SUBSYSTEM}";
+		$lib->{DEBUDIR} = "bin/modules/$lib->{SUBSYSTEM}";
 	}
-	$lib->{TARGET} = "$lib->{BUILDDIR}/$lib->{LIBRARY_REALNAME}";
+	$lib->{TARGET} = "$lib->{DEBUGDIR}/$lib->{LIBRARY_REALNAME}";
 	$lib->{OUTPUT} = $lib->{TARGET};
 }
 
@@ -98,9 +98,9 @@
 	@{$bin->{LINK_LIST}} = ("\$($bin->{TYPE}_$bin->{NAME}\_OBJ_LIST)");
 	@{$bin->{LINK_FLAGS}} = ();
 
-	$bin->{INSTALLDIR} = "bin/install";
-	$bin->{BUILDDIR} = "bin/";
-	$bin->{TARGET} = $bin->{OUTPUT} = "$bin->{BUILDDIR}/$bin->{NAME}";
+	$bin->{RELEASEDIR} = "bin/install";
+	$bin->{DEBUGDIR} = "bin/";
+	$bin->{TARGET} = $bin->{OUTPUT} = "$bin->{DEBUGDIR}/$bin->{NAME}";
 	$bin->{BINARY} = $bin->{NAME};
 }