diff options
| author | Stefan Metzmacher <metze@samba.org> | 2006-12-21 10:04:08 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:29:35 -0500 |
| commit | aae7773e2aa6327d48c6607c043f24a9815995cd (patch) | |
| tree | b281716835b76d6133eb2d45c509861151bc5d66 /source4/build/smb_build | |
| parent | c4274fee711935b758144d7df5f26c593b4e5d14 (diff) | |
| download | samba-aae7773e2aa6327d48c6607c043f24a9815995cd.tar.gz samba-aae7773e2aa6327d48c6607c043f24a9815995cd.tar.bz2 samba-aae7773e2aa6327d48c6607c043f24a9815995cd.zip | |
r20303: try to fix 'make install' on solaris 8, ln -fs doesn't seem to work if
the link already exist
metze
(This used to be commit 6a089d48ec1424eea876ef9c1c65e74b5ee33781)
Diffstat (limited to 'source4/build/smb_build')
| -rw-r--r-- | source4/build/smb_build/makefile.pm | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm index a4f03ae1e8..b52a08712a 100644 --- a/source4/build/smb_build/makefile.pm +++ b/source4/build/smb_build/makefile.pm @@ -230,6 +230,7 @@ sub SharedLibrary($$) $self->{uninstall_plugins} .= "\t\@-rm \$(DESTDIR)\$(MODULESDIR)/$ctx->{SUBSYSTEM}/$ctx->{LIBRARY_REALNAME}\n"; if (defined($ctx->{ALIASES})) { foreach (@{$ctx->{ALIASES}}) { + $self->{install_plugins} .= "\t\@rm -f \$(DESTDIR)\$(MODULESDIR)/$ctx->{SUBSYSTEM}/$_.\$(SHLIBEXT)\n"; $self->{install_plugins} .= "\t\@ln -fs $ctx->{LIBRARY_REALNAME} \$(DESTDIR)\$(MODULESDIR)/$ctx->{SUBSYSTEM}/$_.\$(SHLIBEXT)\n"; $self->{uninstall_plugins} .= "\t\@-rm \$(DESTDIR)\$(MODULESDIR)/$ctx->{SUBSYSTEM}/$_.\$(SHLIBEXT)\n"; } @@ -268,6 +269,7 @@ __EOD__ 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}) { + $lns .= "\n\t\@rm -f $ctx->{SHAREDDIR}/$ctx->{LIBRARY_SONAME}"; $lns .= "\n\t\@ln -fs $ctx->{LIBRARY_REALNAME} $ctx->{SHAREDDIR}/$ctx->{LIBRARY_SONAME}"; } } @@ -275,10 +277,12 @@ __EOD__ if ($self->{config}->{SONAMEFLAG} ne "" and defined($ctx->{LIBRARY_SONAME}) and $ctx->{LIBRARY_REALNAME} ne $ctx->{LIBRARY_SONAME}) { + $lns .= "\n\t\@rm -f $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\@rm -f $ctx->{SHAREDDIR}/$ctx->{LIBRARY_DEBUGNAME}"; $lns .= "\n\t\@ln -fs $ctx->{LIBRARY_REALNAME} $ctx->{SHAREDDIR}/$ctx->{LIBRARY_DEBUGNAME}"; } @@ -298,6 +302,7 @@ __EOD__ if (defined($ctx->{ALIASES})) { foreach (@{$ctx->{ALIASES}}) { + $self->output("\t\@rm -f $ctx->{SHAREDDIR}/$_.\$(SHLIBEXT)\n"); $self->output("\t\@ln -fs $ctx->{LIBRARY_REALNAME} $ctx->{SHAREDDIR}/$_.\$(SHLIBEXT)\n"); } } |