diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-03-04 01:26:19 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-03-04 01:26:19 +0100 |
| commit | e018501ca8e3e12e52557eafa66d104fe65088ae (patch) | |
| tree | 9f094ae09da770e8a09d06c21aa5fc9990097fa2 /source4/build | |
| parent | 2d1c06c5781600a0efcf9becd3e2773dbbbf2cc7 (diff) | |
| download | samba-e018501ca8e3e12e52557eafa66d104fe65088ae.tar.gz samba-e018501ca8e3e12e52557eafa66d104fe65088ae.tar.bz2 samba-e018501ca8e3e12e52557eafa66d104fe65088ae.zip | |
Fix some paths.
(This used to be commit bb16e51e60df296fa7b89eeeba6b80908099dda6)
Diffstat (limited to 'source4/build')
| -rw-r--r-- | source4/build/smb_build/output.pm | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/source4/build/smb_build/output.pm b/source4/build/smb_build/output.pm index ffab456d68..3c3a8a6b48 100644 --- a/source4/build/smb_build/output.pm +++ b/source4/build/smb_build/output.pm @@ -82,12 +82,10 @@ sub generate_static_library($) $lib->{LIBRARY_NAME} = "lib".lc($link_name).".a"; - if (defined($lib->{OBJ_FILES})) { - $lib->{RESULT_STATIC_LIBRARY} = "bin/static/$lib->{LIBRARY_NAME}"; - $lib->{TARGET_STATIC_LIBRARY} = $lib->{RESULT_STATIC_LIBRARY}; - $lib->{STATICDIR} = 'bin/static'; - $lib->{OUTPUT_STATIC_LIBRARY} = "-l".lc($link_name); - } + $lib->{RESULT_STATIC_LIBRARY} = "bin/static/$lib->{LIBRARY_NAME}"; + $lib->{TARGET_STATIC_LIBRARY} = $lib->{RESULT_STATIC_LIBRARY}; + $lib->{STATICDIR} = 'bin/static'; + $lib->{OUTPUT_STATIC_LIBRARY} = "-l".lc($link_name); } sub generate_binary($) |