diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2008-05-28 13:42:29 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2008-05-28 13:42:29 +1000 |
| commit | 0f2d8eacf5217b04c88420513a1a1f52e374d659 (patch) | |
| tree | 0bfa7b93a0ba286db7839279ddb1f1279e658131 /source4/build | |
| parent | baa2dffdf34c2f3aa150695c60742d616eeb3b09 (diff) | |
| parent | bb264d3a1f212be7eca4b38e61db19de8a26e158 (diff) | |
| download | samba-0f2d8eacf5217b04c88420513a1a1f52e374d659.tar.gz samba-0f2d8eacf5217b04c88420513a1a1f52e374d659.tar.bz2 samba-0f2d8eacf5217b04c88420513a1a1f52e374d659.zip | |
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet
(This used to be commit 3038dd8a4ffae4113f49547a9d4d6b1c8c46397a)
Diffstat (limited to 'source4/build')
| -rw-r--r-- | source4/build/smb_build/input.pm | 1 | ||||
| -rw-r--r-- | source4/build/smb_build/output.pm | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/source4/build/smb_build/input.pm b/source4/build/smb_build/input.pm index a76da496d9..53a051a3c7 100644 --- a/source4/build/smb_build/input.pm +++ b/source4/build/smb_build/input.pm @@ -84,7 +84,6 @@ sub check_module($$$) return if ($mod->{ENABLE} ne "YES"); - if (exists($INPUT->{$mod->{SUBSYSTEM}}{INIT_FUNCTION_TYPE})) { $mod->{INIT_FUNCTION_TYPE} = $INPUT->{$mod->{SUBSYSTEM}}{INIT_FUNCTION_TYPE}; } else { diff --git a/source4/build/smb_build/output.pm b/source4/build/smb_build/output.pm index f9f12c3a73..76c6d3fc8f 100644 --- a/source4/build/smb_build/output.pm +++ b/source4/build/smb_build/output.pm @@ -52,7 +52,7 @@ sub generate_shared_library($) $lib->{RESULT_SHARED_LIBRARY} = "$lib->{SHAREDDIR}/$lib->{LIBRARY_REALNAME}"; $lib->{OUTPUT_SHARED_LIBRARY} = "-l$link_name"; - $lib->{TARGET_SHARED_LIBRARY} = $lib->{RESULT_SHARED_LIBRARY}; + $lib->{TARGET_SHARED_LIBRARY} = "$lib->{SHAREDDIR}/$lib->{LIBRARY_DEBUGNAME}"; } sub generate_merged_obj($) |