diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-03-09 00:49:39 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-03-09 00:49:39 +0100 |
| commit | a4b6992b7023d5b67428739c29aa9948d76fca21 (patch) | |
| tree | 27d7f2bcb4294ab900c3eb5cbe87ccd9b63963e2 /source4/build/smb_build/output.pm | |
| parent | 7bb0d0b649eab94a3339c9d0f2f704a2eb0a6101 (diff) | |
| download | samba-a4b6992b7023d5b67428739c29aa9948d76fca21.tar.gz samba-a4b6992b7023d5b67428739c29aa9948d76fca21.tar.bz2 samba-a4b6992b7023d5b67428739c29aa9948d76fca21.zip | |
Move more code out of perl build system.
(This used to be commit bfb4d847005567da43e93987add1a7b171b7b192)
Diffstat (limited to 'source4/build/smb_build/output.pm')
| -rw-r--r-- | source4/build/smb_build/output.pm | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/source4/build/smb_build/output.pm b/source4/build/smb_build/output.pm index 3dd3f0bda1..f9f12c3a73 100644 --- a/source4/build/smb_build/output.pm +++ b/source4/build/smb_build/output.pm @@ -47,10 +47,8 @@ sub generate_shared_library($) $lib->{LIBRARY_DEBUGNAME} = $lib->{LIBRARY_REALNAME}; - if (defined($lib->{VERSION})) { - $lib->{LIBRARY_SONAME} = "$lib->{LIBRARY_REALNAME}.\$($lib->{NAME}_SOVERSION)"; - $lib->{LIBRARY_REALNAME} = "$lib->{LIBRARY_REALNAME}.\$($lib->{NAME}_VERSION)"; - } + $lib->{LIBRARY_SONAME} = "\$(if \$($lib->{NAME}_SOVERSION),$lib->{LIBRARY_REALNAME}.\$($lib->{NAME}_SOVERSION),$lib->{LIBRARY_REALNAME})"; + $lib->{LIBRARY_REALNAME} = "\$(if \$($lib->{NAME}_VERSION),$lib->{LIBRARY_REALNAME}.\$($lib->{NAME}_VERSION),$lib->{LIBRARY_REALNAME})"; $lib->{RESULT_SHARED_LIBRARY} = "$lib->{SHAREDDIR}/$lib->{LIBRARY_REALNAME}"; $lib->{OUTPUT_SHARED_LIBRARY} = "-l$link_name"; |