From c23ef0a872cad60be9189df57bab9b77872284da Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 3 Apr 2006 00:46:17 +0000
Subject: r14874: Allow overriding LIBRARY_REALNAME (This used to be commit
 8f57c0e7bcd99556ba83497ce17b6723a637ac76)

---
 source4/build/smb_build/output.pm | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 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 8b7f774f26..5593558c0c 100644
--- a/source4/build/smb_build/output.pm
+++ b/source4/build/smb_build/output.pm
@@ -58,16 +58,22 @@ sub generate_shared_library($)
 		$lib_name = "lib$link_name";
 	}
 
-	if ($lib->{TYPE} eq "MODULE") {
-		$lib->{DEBUGDIR} = "bin/modules/$lib->{SUBSYSTEM}";
-		$lib->{RELEASEDIR} = "bin/install/modules/$lib->{SUBSYSTEM}";
-		$lib->{LIBRARY_REALNAME} = $link_name;
-		$lib->{LIBRARY_REALNAME} =~ s/^$lib->{SUBSYSTEM}_//g;
-		$lib->{LIBRARY_REALNAME}.= ".\$(SHLIBEXT)";
+	if (defined($lib->{LIBRARY_REALNAME})) {
+		$lib->{BASEDIR} =~ s/^\.\///g;
+		$lib->{LIBRARY_REALNAME} = "$lib->{LIBRARY_REALNAME}";
+		$lib->{DEBUGDIR} = $lib->{RELEASEDIR} = $lib->{BASEDIR};
 	} else {
-		$lib->{DEBUGDIR} = "bin";
-		$lib->{RELEASEDIR} = "bin/install";
-		$lib->{LIBRARY_REALNAME} = "$lib_name.\$(SHLIBEXT)";
+		if ($lib->{TYPE} eq "MODULE") {
+			$lib->{DEBUGDIR} = "bin/modules/$lib->{SUBSYSTEM}";
+			$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->{DEBUGDIR} = "bin";
+			$lib->{RELEASEDIR} = "bin/install";
+			$lib->{LIBRARY_REALNAME} = "$lib_name.\$(SHLIBEXT)";
+		}
 	}
 
 	if (defined($lib->{VERSION})) {
-- 
cgit