From 58483adfb669b0863f67641f70517a102833bcae Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Wed, 22 Mar 2006 22:55:29 +0000
Subject: r14666: Fix handling of naming of shared modules when not in
 developer mode (This used to be commit
 2638899529ca17ee0557d4491a51c21437b581b3)

---
 source4/build/smb_build/output.pm | 31 ++++++++++++++-----------------
 1 file changed, 14 insertions(+), 17 deletions(-)

(limited to 'source4/build/smb_build/output.pm')

diff --git a/source4/build/smb_build/output.pm b/source4/build/smb_build/output.pm
index acff857497..8b7f774f26 100644
--- a/source4/build/smb_build/output.pm
+++ b/source4/build/smb_build/output.pm
@@ -59,26 +59,23 @@ sub generate_shared_library($)
 	}
 
 	if ($lib->{TYPE} eq "MODULE") {
-		$lib->{FIXED_NAME} = $link_name;
-		$lib->{FIXED_NAME} =~ s/^$lib->{SUBSYSTEM}_//g;
-	}
-
-	$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->{DEBUGDIR} = "bin/modules/$lib->{SUBSYSTEM}";
-	}
-
-	if (defined($lib->{FIXED_NAME})) {
-		$lib->{TARGET} = "$lib->{DEBUGDIR}/$lib->{FIXED_NAME}.\$(SHLIBEXT)";
+		$lib->{RELEASEDIR} = "bin/install/modules/$lib->{SUBSYSTEM}";
+		$lib->{LIBRARY_REALNAME} = $link_name;
+		$lib->{LIBRARY_REALNAME} =~ s/^$lib->{SUBSYSTEM}_//g;
+		$lib->{LIBRARY_REALNAME}.= ".\$(SHLIBEXT)";
 	} else {
-		$lib->{TARGET} = "$lib->{DEBUGDIR}/$lib->{LIBRARY_REALNAME}";
+		$lib->{DEBUGDIR} = "bin";
+		$lib->{RELEASEDIR} = "bin/install";
+		$lib->{LIBRARY_REALNAME} = "$lib_name.\$(SHLIBEXT)";
 	}
+
+	if (defined($lib->{VERSION})) {
+		$lib->{LIBRARY_SONAME} = $lib->{LIBRARY_REALNAME}.".$lib->{SO_VERSION}";
+		$lib->{LIBRARY_REALNAME} = $lib->{LIBRARY_REALNAME}.".$lib->{VERSION}";
+	} 
+	
+	$lib->{TARGET} = "$lib->{DEBUGDIR}/$lib->{LIBRARY_REALNAME}";
 	$lib->{OUTPUT} = $lib->{TARGET};
 }
 
-- 
cgit