From 3ddf4e831a4c66d085f1294aa008f5655416ae7c Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sun, 19 Mar 2006 17:24:31 +0000
Subject: r14565: Fix shared library sonames (This used to be commit
 3e6b75d955cc49becf9145fbe4380c4e7e7f81f6)

---
 source4/build/smb_build/makefile.pm | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

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

diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm
index 73f315cf4f..6ed1c36d13 100644
--- a/source4/build/smb_build/makefile.pm
+++ b/source4/build/smb_build/makefile.pm
@@ -248,10 +248,9 @@ __EOD__
 	if ($self->{config}->{SONAMEFLAG} ne "" and 
 		defined($ctx->{LIBRARY_SONAME})) {
 		$soarg = "$self->{config}->{SONAMEFLAG}$ctx->{LIBRARY_SONAME} ";
-	}
-
-	if ($self->{config}->{SONAMEFLAG} ne "") {
-		$soargdebug = "$self->{config}->{SONAMEFLAG}$ctx->{LIBRARY_REALNAME} ";
+		if ($ctx->{LIBRARY_REALNAME} ne $ctx->{LIBRARY_SONAME}) {
+			$soargdebug = "\tln -fs $ctx->{LIBRARY_REALNAME} $ctx->{DEBUGDIR}/$ctx->{LIBRARY_SONAME}\n";
+		}
 	}
 
 	if ($self->{duplicate_build}) {
@@ -262,9 +261,9 @@ $ctx->{TARGET}: \$($ctx->{TYPE}_$ctx->{NAME}_DEPEND_LIST) \$($ctx->{TYPE}_$ctx->
 	\@echo Linking \$\@
 	\@mkdir -p $ctx->{DEBUGDIR}
 	\@\$(SHLD) \$(SHLD_FLAGS) -o \$\@ \$(LOCAL_LINK_FLAGS) \\
-		\$($ctx->{TYPE}_$ctx->{NAME}_LINK_FLAGS) $soargdebug \\
+		\$($ctx->{TYPE}_$ctx->{NAME}_LINK_FLAGS) $soarg \\
 		$init_obj \$($ctx->{TYPE}_$ctx->{NAME}_LINK_LIST)
-
+$soargdebug
 __EOD__
 );
 	}
-- 
cgit