diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-02-25 18:14:03 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-02-25 18:14:03 +0100 |
| commit | aab0ef161ca647fb7daecc3dba349d3fe1be982c (patch) | |
| tree | 838f139d36c52680224bbb5bfa9de67b9a36d46a /source4/build/smb_build/makefile.pm | |
| parent | 943f61be400c332f583d87da7ef96ca7f8cbb306 (diff) | |
| download | samba-aab0ef161ca647fb7daecc3dba349d3fe1be982c.tar.gz samba-aab0ef161ca647fb7daecc3dba349d3fe1be982c.tar.bz2 samba-aab0ef161ca647fb7daecc3dba349d3fe1be982c.zip | |
Use more GNU-make specific variables.
(This used to be commit 1e710575c408ca57b52d0548f2fa4ea713ded03c)
Diffstat (limited to 'source4/build/smb_build/makefile.pm')
| -rw-r--r-- | source4/build/smb_build/makefile.pm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm index 387e929a9e..34e1d4817f 100644 --- a/source4/build/smb_build/makefile.pm +++ b/source4/build/smb_build/makefile.pm @@ -184,7 +184,7 @@ sub SharedLibrary($$) $ctx->{RESULT_SHARED_LIBRARY}: \$($ctx->{NAME}_DEPEND_LIST) \$($ctx->{NAME}_FULL_OBJ_LIST) \@echo Linking \$\@ - \@mkdir -p $ctx->{SHAREDDIR} + \@mkdir -p \$(D@) \@\$(SHLD) \$(LDFLAGS) \$(SHLD_FLAGS) \$(INTERN_LDFLAGS) -o \$\@ \$(INSTALL_LINK_FLAGS) \\ \$($ctx->{NAME}\_FULL_OBJ_LIST) \\ \$($ctx->{NAME}_LINK_FLAGS) \\ @@ -210,7 +210,7 @@ sub MergedObj($$) # $ctx->{RESULT_MERGED_OBJ}: \$($ctx->{NAME}_OBJ_LIST) \@echo Partially linking \$@ - \@mkdir -p bin/mergedobj + \@mkdir -p \$(D@) \$(PARTLINK) -o \$@ \$($ctx->{NAME}_OBJ_LIST) __EOD__ |