diff --git a/base/src/TSystem.cxx b/base/src/TSystem.cxx index c5231f670ed40578db65817074b25101e802678c..f7903a8471b9fa3c0c146a945b3757fdbb286df2 100644 --- a/base/src/TSystem.cxx +++ b/base/src/TSystem.cxx @@ -1,4 +1,4 @@ -// @(#)root/base:$Name: $:$Id: TSystem.cxx,v 1.57 2003/03/11 02:27:32 rdm Exp $ +// @(#)root/base:$Name: $:$Id: TSystem.cxx,v 1.58 2003/03/11 07:57:55 brun Exp $ // Author: Fons Rademakers 15/09/95 /************************************************************************* @@ -1441,6 +1441,9 @@ int TSystem::CompileMacro(const char *filename, Option_t * opt, // if non-zero, build_loc indicates where to build the shared library. TString build_loc = GetBuildDir(); if (build_dir && strlen(build_dir)) build_loc = build_dir; + if (! IsAbsoluteFileName(build_loc) ) { + build_loc = ConcatFileName( WorkingDirectory(), build_loc ); + } // ======= Get the right file names for the dictionnary and the shared library TString library = filename; @@ -1944,6 +1947,10 @@ const char *TSystem::GetBuildNode() const //______________________________________________________________________________ const char *TSystem::GetBuildDir() const { + if (fBuildDir.Length()==0) { + if (!gEnv) return ""; + const_cast<TSystem*>(this)->fBuildDir = gEnv->GetValue("ACLiC.BuildDir",""); + } return fBuildDir; } diff --git a/config/rootrc.in b/config/rootrc.in index cbee386369fdb6b425ed22f07d65674c6b63071f..c6afe11ebd9c79621d6bf1314e5a8e17eccb0bf8 100644 --- a/config/rootrc.in +++ b/config/rootrc.in @@ -1,4 +1,4 @@ -# @(#)root/config:$Name: $:$Id: rootrc.in,v 1.42 2003/03/10 14:57:11 rdm Exp $ +# @(#)root/config:$Name: $:$Id: rootrc.in,v 1.43 2003/04/04 00:52:39 rdm Exp $ # Author: Fons Rademakers 22/09/95 # ROOT Environment settings are handled via the class TEnv. To see @@ -125,6 +125,8 @@ Rint.History: $(HOME)/.root_hist # ACLiC.Linkdef specifies the suffix that will be added to the script name to # try to locate a custom linkdef file when generating the dictionary. ACLiC.Linkdef: _linkdef +# Set a top directory for storing the libraries produced by ACLiC +#ACLiC.BuildDir: /where/I/would/like/my/compiled/scripts # Default authentication method for rootd (0=clear, 1=SRP, 2=Krb5) Rootd.Authentication: 0