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

[jelmer at samba.org]

Author: jelmer
Date: 2006-03-26 01:37:31 +0000 (Sun, 26 Mar 2006)
New Revision: 14737

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

Log:
Fix shared library build without --enable-developer

Modified:
   branches/SAMBA_4_0/source/build/smb_build/makefile.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-26 01:23:40 UTC (rev 14736)
+++ branches/SAMBA_4_0/source/build/smb_build/makefile.pm	2006-03-26 01:37:31 UTC (rev 14737)
@@ -258,6 +258,8 @@
 		}
 	}
 
+	my $singlesoarg = "";
+	
 	if ($self->{duplicate_build}) {
 		$self->output(<< "__EOD__"
 #
@@ -277,6 +279,13 @@
 		}
 
 		$self->output("\n");
+	} else {
+		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} $installdir/$ctx->{LIBRARY_SONAME}";
+		}
+
 	}
 
 	$self->output(<< "__EOD__"
@@ -285,9 +294,9 @@
 $installdir/$ctx->{LIBRARY_REALNAME}: \$($ctx->{TYPE}_$ctx->{NAME}_DEPEND_LIST) \$($ctx->{TYPE}_$ctx->{NAME}_OBJ_LIST) $init_obj
 	\@echo Linking \$\@
 	\@mkdir -p $installdir
-	\@\$(SHLD) \$(SHLD_FLAGS) -o \$\@ \\
+	\@\$(SHLD) \$(SHLD_FLAGS) -o \$\@ \$(INSTALL_LINK_FLAGS) \\
 		\$($ctx->{TYPE}_$ctx->{NAME}_LINK_FLAGS) $soarg \\
-		$init_obj \$($ctx->{TYPE}_$ctx->{NAME}_LINK_LIST)
+		$init_obj \$($ctx->{TYPE}_$ctx->{NAME}_LINK_LIST)$singlesoarg
 
 __EOD__
 );