From 253c1bec462de467a923f7a8951598f7abbe163e Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Thu, 21 Dec 2006 01:51:35 +0000
Subject: r20298: Fix pidl tests (missing symlink..). (This used to be commit
 ab3d57394630cefc1fefe859c8bd3d56f6e63695)

---
 source4/build/smb_build/makefile.pm | 14 ++++++++------
 source4/build/smb_build/output.pm   |  2 ++
 2 files changed, 10 insertions(+), 6 deletions(-)

(limited to 'source4/build/smb_build')

diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm
index b639612fed..a4f03ae1e8 100644
--- a/source4/build/smb_build/makefile.pm
+++ b/source4/build/smb_build/makefile.pm
@@ -264,20 +264,22 @@ __EOD__
 	}
 
 	my $soarg = "";
-	my $soargdebug = "";
+	my $lns = "";
 	if ($self->{config}->{SONAMEFLAG} ne "" and defined($ctx->{LIBRARY_SONAME})) {
 		$soarg = "$self->{config}->{SONAMEFLAG}$ctx->{LIBRARY_SONAME} ";
 		if ($ctx->{LIBRARY_REALNAME} ne $ctx->{LIBRARY_SONAME}) {
-			$soargdebug = "\n\t\@ln -fs $ctx->{LIBRARY_REALNAME} $ctx->{SHAREDDIR}/$ctx->{LIBRARY_SONAME}";
+			$lns .= "\n\t\@ln -fs $ctx->{LIBRARY_REALNAME} $ctx->{SHAREDDIR}/$ctx->{LIBRARY_SONAME}";
 		}
 	}
 
-	my $singlesoarg = "";
-
 	if ($self->{config}->{SONAMEFLAG} ne "" and 
 		defined($ctx->{LIBRARY_SONAME}) and 
 		$ctx->{LIBRARY_REALNAME} ne $ctx->{LIBRARY_SONAME}) {
-		$singlesoarg = "\n\t\@ln -fs $ctx->{LIBRARY_REALNAME} $ctx->{SHAREDDIR}/$ctx->{LIBRARY_SONAME}";
+		$lns .= "\n\t\@ln -fs $ctx->{LIBRARY_REALNAME} $ctx->{SHAREDDIR}/$ctx->{LIBRARY_SONAME}";
+	}
+
+	if (defined($ctx->{LIBRARY_SONAME})) {
+		$lns .= "\n\t\@ln -fs $ctx->{LIBRARY_REALNAME} $ctx->{SHAREDDIR}/$ctx->{LIBRARY_DEBUGNAME}";
 	}
 
 	$self->output(<< "__EOD__"
@@ -290,7 +292,7 @@ $ctx->{SHAREDDIR}/$ctx->{LIBRARY_REALNAME}: \$($ctx->{TYPE}_$ctx->{NAME}_DEPEND_
 		\$($ctx->{TYPE}_$ctx->{NAME}\_FULL_OBJ_LIST) \\
 		\$($ctx->{TYPE}_$ctx->{NAME}_LINK_FLAGS) $extraflags \\
 		 $soarg \\
-		$init_obj $singlesoarg$soargdebug
+		$init_obj $lns
 __EOD__
 );
 
diff --git a/source4/build/smb_build/output.pm b/source4/build/smb_build/output.pm
index 1451b8bb7d..e90a7fb2a2 100644
--- a/source4/build/smb_build/output.pm
+++ b/source4/build/smb_build/output.pm
@@ -65,6 +65,8 @@ sub generate_shared_library($)
 		}
 	}
 
+	$lib->{LIBRARY_DEBUGNAME} = $lib->{LIBRARY_REALNAME};
+
 	if (defined($lib->{VERSION})) {
 		$lib->{LIBRARY_SONAME} = "$lib->{LIBRARY_REALNAME}.$lib->{SO_VERSION}";
 		$lib->{LIBRARY_REALNAME} = "$lib->{LIBRARY_REALNAME}.$lib->{VERSION}";
-- 
cgit