diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2006-03-13 18:54:33 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:57:13 -0500 |
| commit | b67cf4ce262c834015ffda7bbbc1c62711f097aa (patch) | |
| tree | a6e28bd29fac764aa21fd4f0c92091a6efd296dc /source4/build/smb_build/makefile.pm | |
| parent | e47f76e96dde0ab53a51a6cd66372eafa2b1385d (diff) | |
| download | samba-b67cf4ce262c834015ffda7bbbc1c62711f097aa.tar.gz samba-b67cf4ce262c834015ffda7bbbc1c62711f097aa.tar.bz2 samba-b67cf4ce262c834015ffda7bbbc1c62711f097aa.zip | |
r14335: Build shared modules in bin/modules/$SUBSYSTEM when in developer mode.
(This used to be commit 4799f7bd1fbf0ed3cd4c52bd6eef129666ac74b5)
Diffstat (limited to 'source4/build/smb_build/makefile.pm')
| -rw-r--r-- | source4/build/smb_build/makefile.pm | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm index 7002bc8844..1ff2e0cfa6 100644 --- a/source4/build/smb_build/makefile.pm +++ b/source4/build/smb_build/makefile.pm @@ -206,15 +206,15 @@ sub SharedLibrary($$) my $init_obj = ""; if ($self->{duplicate_build}) { - $installdir = "bin/install"; + $installdir = $ctx->{INSTALLDIR}; } else { - $installdir = "bin"; + $installdir = $ctx->{BUILDDIR}; } if ($ctx->{TYPE} eq "LIBRARY") { - push (@{$self->{shared_libs}}, "bin/$ctx->{LIBRARY_REALNAME}"); + push (@{$self->{shared_libs}}, "$ctx->{BUILDDIR}/$ctx->{LIBRARY_REALNAME}"); } elsif ($ctx->{TYPE} eq "MODULE") { - push (@{$self->{shared_modules}}, "bin/$ctx->{LIBRARY_REALNAME}"); + push (@{$self->{shared_modules}}, "$ctx->{BUILDDIR}/$ctx->{LIBRARY_REALNAME}"); push (@{$self->{plugins}}, "$installdir/$ctx->{LIBRARY_REALNAME}"); my $fixedname = $ctx->{NAME}; @@ -267,8 +267,9 @@ __EOD__ $self->output(<< "__EOD__" # -bin/$ctx->{LIBRARY_REALNAME}: \$($ctx->{TYPE}_$ctx->{NAME}_DEPEND_LIST) \$($ctx->{TYPE}_$ctx->{NAME}_OBJ_LIST) $init_obj +$ctx->{TARGET}: \$($ctx->{TYPE}_$ctx->{NAME}_DEPEND_LIST) \$($ctx->{TYPE}_$ctx->{NAME}_OBJ_LIST) $init_obj \@echo Linking \$\@ + \@mkdir -p $ctx->{BUILDDIR} \@\$(SHLD) \$(SHLD_FLAGS) -o \$\@ \$(LOCAL_LINK_FLAGS) \\ \$($ctx->{TYPE}_$ctx->{NAME}_LINK_FLAGS) $soarg \\ $init_obj \$($ctx->{TYPE}_$ctx->{NAME}_LINK_LIST) |