mirror of
https://github.com/samba-team/samba.git
synced 2024-12-23 17:34:34 +03:00
r14469: Don't the variable INSTALLDIR for two different things...
This commit is contained in:
parent
b91b191318
commit
fd47e975a4
@ -206,15 +206,15 @@ sub SharedLibrary($$)
|
||||
my $init_obj = "";
|
||||
|
||||
if ($self->{duplicate_build}) {
|
||||
$installdir = $ctx->{INSTALLDIR};
|
||||
$installdir = $ctx->{RELEASEDIR};
|
||||
} else {
|
||||
$installdir = $ctx->{BUILDDIR};
|
||||
$installdir = $ctx->{DEBUGDIR};
|
||||
}
|
||||
|
||||
if ($ctx->{TYPE} eq "LIBRARY") {
|
||||
push (@{$self->{shared_libs}}, "$ctx->{BUILDDIR}/$ctx->{LIBRARY_REALNAME}");
|
||||
push (@{$self->{shared_libs}}, "$ctx->{DEBUDRI}/$ctx->{LIBRARY_REALNAME}");
|
||||
} elsif ($ctx->{TYPE} eq "MODULE") {
|
||||
push (@{$self->{shared_modules}}, "$ctx->{BUILDDIR}/$ctx->{LIBRARY_REALNAME}");
|
||||
push (@{$self->{shared_modules}}, "$ctx->{DEBUGDIR}/$ctx->{LIBRARY_REALNAME}");
|
||||
push (@{$self->{plugins}}, "$installdir/$ctx->{LIBRARY_REALNAME}");
|
||||
|
||||
my $fixedname = $ctx->{NAME};
|
||||
@ -269,7 +269,7 @@ __EOD__
|
||||
|
||||
$ctx->{TARGET}: \$($ctx->{TYPE}_$ctx->{NAME}_DEPEND_LIST) \$($ctx->{TYPE}_$ctx->{NAME}_OBJ_LIST) $init_obj
|
||||
\@echo Linking \$\@
|
||||
\@mkdir -p $ctx->{BUILDDIR}
|
||||
\@mkdir -p $ctx->{DEBUGDIR}
|
||||
\@\$(SHLD) \$(SHLD_FLAGS) -o \$\@ \$(LOCAL_LINK_FLAGS) \\
|
||||
\$($ctx->{TYPE}_$ctx->{NAME}_LINK_FLAGS) $soarg \\
|
||||
$init_obj \$($ctx->{TYPE}_$ctx->{NAME}_LINK_LIST)
|
||||
|
@ -58,17 +58,17 @@ sub generate_shared_library($)
|
||||
$lib_name = "lib$link_name";
|
||||
}
|
||||
|
||||
$lib->{BUILDDIR} = "bin";
|
||||
$lib->{INSTALLDIR} = "bin/install";
|
||||
$lib->{DEBUGDIR} = "bin";
|
||||
$lib->{RELEASEDIR} = "bin/install";
|
||||
$lib->{LIBRARY_REALNAME} = $lib->{LIBRARY_NAME} = "$lib_name.\$(SHLIBEXT)";
|
||||
|
||||
if (defined($lib->{VERSION})) {
|
||||
$lib->{LIBRARY_SONAME} = $lib->{LIBRARY_NAME}.".$lib->{SO_VERSION}";
|
||||
$lib->{LIBRARY_REALNAME} = $lib->{LIBRARY_NAME}.".$lib->{VERSION}";
|
||||
} elsif ($lib->{TYPE} eq "MODULE") {
|
||||
$lib->{BUILDDIR} = "bin/modules/$lib->{SUBSYSTEM}";
|
||||
$lib->{DEBUDIR} = "bin/modules/$lib->{SUBSYSTEM}";
|
||||
}
|
||||
$lib->{TARGET} = "$lib->{BUILDDIR}/$lib->{LIBRARY_REALNAME}";
|
||||
$lib->{TARGET} = "$lib->{DEBUGDIR}/$lib->{LIBRARY_REALNAME}";
|
||||
$lib->{OUTPUT} = $lib->{TARGET};
|
||||
}
|
||||
|
||||
@ -98,9 +98,9 @@ sub generate_binary($)
|
||||
@{$bin->{LINK_LIST}} = ("\$($bin->{TYPE}_$bin->{NAME}\_OBJ_LIST)");
|
||||
@{$bin->{LINK_FLAGS}} = ();
|
||||
|
||||
$bin->{INSTALLDIR} = "bin/install";
|
||||
$bin->{BUILDDIR} = "bin/";
|
||||
$bin->{TARGET} = $bin->{OUTPUT} = "$bin->{BUILDDIR}/$bin->{NAME}";
|
||||
$bin->{RELEASEDIR} = "bin/install";
|
||||
$bin->{DEBUGDIR} = "bin/";
|
||||
$bin->{TARGET} = $bin->{OUTPUT} = "$bin->{DEBUGDIR}/$bin->{NAME}";
|
||||
$bin->{BINARY} = $bin->{NAME};
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user