From d3386f0ed12cf1082f5d793d3df289361c4a4aa3 Mon Sep 17 00:00:00 2001 From: David Rose Date: Tue, 12 Feb 2002 17:31:43 +0000 Subject: [PATCH] eliminate TTMODELS from path --- dtool/src/attach/ctattch.pl | 41 +++++++++++++++++++++++-------------- 1 file changed, 26 insertions(+), 15 deletions(-) diff --git a/dtool/src/attach/ctattch.pl b/dtool/src/attach/ctattch.pl index e017dbe2b9..0ecd6bee89 100644 --- a/dtool/src/attach/ctattch.pl +++ b/dtool/src/attach/ctattch.pl @@ -363,29 +363,40 @@ sub CTAttachCompute { # helps when attaching to unitialized trees that do not have # these directories yet (but will shortly). - $item = $root . "/bin" ; - #if ( -e $item ) { + # However, we *will* filter out any trees whose name ends in + # "MODELS". These don't have subdirectories that we care about + # in the normal sense. + if ( ! ( $proj =~ /MODELS$/ ) ) { + + $item = $root . "/bin" ; + #if ( -e $item ) { &CTAttachMod( "PATH", $item, $root, $proj ) ; - #} - $item = $root . "/lib" ; - #if ( -e $item ) { + #} + + $item = $root . "/lib" ; + #if ( -e $item ) { if ( $ENV{"PENV"} eq "WIN32" ) { &CTAttachMod( "PATH", $item, $root, $proj ) ; } &CTAttachMod( "LD_LIBRARY_PATH", $item, $root, $proj ) ; - #} - $item = $root . "/src" ; - #if ( -e $item ) { + #} + + $item = $root . "/src" ; + #if ( -e $item ) { &CTAttachMod( "CDPATH", $item, $root, $proj ) ; - #} - $item = $root . "/include" ; - #if ( -e $item ) { + #} + + $item = $root . "/include" ; + #if ( -e $item ) { &CTAttachMod( "CT_INCLUDE_PATH", $item, $root, $proj ) ; - #} - $item = $root . "/etc" ; - #if ( -e $item ) { + #} + + $item = $root . "/etc" ; + #if ( -e $item ) { &CTAttachMod( "ETC_PATH", $item, $root, $proj ) ; - #} + #} + } + &CTAttachMod( "CTPROJS", $proj . ":" . $flav, $root, $proj ) ; &CTAttachSet( $proj, $root ) ;