diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2006-03-26 01:37:31 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:59:18 -0500 |
| commit | 961232bf7f720b98d6e3ac617fa5af14c17cad1f (patch) | |
| tree | 19f964385780f252eb17cb879f24c4eae83797f0 /source4/build/smb_build | |
| parent | ad06a8bd651e3a8b598c92a356ac1ce4117ae72e (diff) | |
| download | samba-961232bf7f720b98d6e3ac617fa5af14c17cad1f.tar.gz samba-961232bf7f720b98d6e3ac617fa5af14c17cad1f.tar.bz2 samba-961232bf7f720b98d6e3ac617fa5af14c17cad1f.zip | |
r14737: Fix shared library build without --enable-developer
(This used to be commit d508382180c586ec0a749883b2c75561732d6f37)
Diffstat (limited to 'source4/build/smb_build')
| -rw-r--r-- | source4/build/smb_build/makefile.pm | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm index f002779128..0277eb658a 100644 --- a/source4/build/smb_build/makefile.pm +++ b/source4/build/smb_build/makefile.pm @@ -258,6 +258,8 @@ __EOD__ } } + my $singlesoarg = ""; + if ($self->{duplicate_build}) { $self->output(<< "__EOD__" # @@ -277,6 +279,13 @@ __EOD__ } $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 @@ __EOD__ $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__ ); |