summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2006-03-16 11:41:12 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:57:29 -0500
commitbc8eb1e6e56dfd2188408f09af0ef62db65d1197 (patch)
tree8b1b086123039fd1a8877e6a6eac93d1c71976ce
parent16f9685eafecfb3aa8f54ed600274521e8d7b51f (diff)
downloadsamba-bc8eb1e6e56dfd2188408f09af0ef62db65d1197.tar.gz
samba-bc8eb1e6e56dfd2188408f09af0ef62db65d1197.tar.bz2
samba-bc8eb1e6e56dfd2188408f09af0ef62db65d1197.zip
r14469: Don't the variable INSTALLDIR for two different things...
(This used to be commit fd47e975a4c4d225e7513b6dd2223a8eac9b4348)
-rw-r--r--source4/build/smb_build/makefile.pm10
-rw-r--r--source4/build/smb_build/output.pm14
2 files changed, 12 insertions, 12 deletions
diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm
index 1ff2e0cfa6..cc831683a5 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 = $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)
diff --git a/source4/build/smb_build/output.pm b/source4/build/smb_build/output.pm
index 15ce5a78b0..21885bed8c 100644
--- a/source4/build/smb_build/output.pm
+++ b/source4/build/smb_build/output.pm
@@ -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};
}