diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-02-13 21:03:01 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-02-13 21:03:01 +0100 |
| commit | b0a7e5476b0510f69d1282bb33b9b7de67a28577 (patch) | |
| tree | 47e77768d1e66660e74a172defe0219a726a3e18 /source4/build/smb_build/output.pm | |
| parent | 501005c2eb3de794f72121d62bf7769e9109a032 (diff) | |
| download | samba-b0a7e5476b0510f69d1282bb33b9b7de67a28577.tar.gz samba-b0a7e5476b0510f69d1282bb33b9b7de67a28577.tar.bz2 samba-b0a7e5476b0510f69d1282bb33b9b7de67a28577.zip | |
Use more variables in generated data.mk.
(This used to be commit 2dce9e4e0d5ba8785fdee3daba91e6c9f4a32040)
Diffstat (limited to 'source4/build/smb_build/output.pm')
| -rw-r--r-- | source4/build/smb_build/output.pm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source4/build/smb_build/output.pm b/source4/build/smb_build/output.pm index fbf14f7e91..3088a98c8c 100644 --- a/source4/build/smb_build/output.pm +++ b/source4/build/smb_build/output.pm @@ -81,8 +81,8 @@ sub generate_shared_library($) $lib->{LIBRARY_DEBUGNAME} = $lib->{LIBRARY_REALNAME}; if (defined($lib->{VERSION}) and $config::config{SONAMEFLAG} ne "#") { - $lib->{LIBRARY_SONAME} = "$lib->{LIBRARY_REALNAME}.$lib->{SO_VERSION}"; - $lib->{LIBRARY_REALNAME} = "$lib->{LIBRARY_REALNAME}.$lib->{VERSION}"; + $lib->{LIBRARY_SONAME} = "$lib->{LIBRARY_REALNAME}.\$($lib->{NAME}_SOVERSION)"; + $lib->{LIBRARY_REALNAME} = "$lib->{LIBRARY_REALNAME}.\$($lib->{NAME}_VERSION)"; } $lib->{TARGET_SHARED_LIBRARY} = "$lib->{SHAREDDIR}/$lib->{LIBRARY_REALNAME}"; @@ -107,7 +107,7 @@ sub generate_static_library($) } else { $lib->{TARGET_STATIC_LIBRARY} = ""; } - $lib->{OUTPUT_STATIC_LIBRARY} = $lib->{TARGET_STATIC_LIBRARY}; + $lib->{OUTPUT_STATIC_LIBRARY} = "-l".lc($link_name); } sub generate_binary($) |