From df49c60c9671e4a28e636964d744c1f59fb6cb68 Mon Sep 17 00:00:00 2001
From: Joel Sherrill <joel.sherrill@OARcorp.com>
Date: Mon, 12 Jun 2000 15:00:15 +0000
Subject: Merged from 4.5.0-beta3a

---
 tools/update/cipolish | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

(limited to 'tools/update/cipolish')

diff --git a/tools/update/cipolish b/tools/update/cipolish
index c04e0c52c6..dd3bb8084f 100755
--- a/tools/update/cipolish
+++ b/tools/update/cipolish
@@ -12,15 +12,18 @@
 
 # $Id$
 
-# find relative up-path to configure.in
+use strict ;
+
+my @vars = () ;
+my @buffer = () ;
+
+# find relative up-path to VERSION
 my $rtems_cfg = &find_file(".","VERSION");
 my $rtems_root = &find_root() ;
 $rtems_root =~ tr/\//\-/ ;
 my $rtems_name = "rtems" ;
 $rtems_name .=  "-" . "$rtems_root" if (length($rtems_root) > 0 ) ;
 
-my @buffer = () ;
-
 while ( <> )
 {
   push @buffer, "$_" ;
@@ -126,8 +129,8 @@ while ( <> )
   {
     if ( /^[\s]*(RTEMS_ENABLE_LIBCDIR).*$/o )
     {
-      if (  ( not defined $var_RTEMS_PROG_CC_FOR_TARGET )
-        and ( not defined $var_RTEMS_PROG_CXX_FOR_TARGET )
+      if (  ( not defined $main::var_RTEMS_PROG_CC_FOR_TARGET )
+        and ( not defined $main::var_RTEMS_PROG_CXX_FOR_TARGET )
       ) 
       {
         push @tbuf, "$_" ;
@@ -165,7 +168,7 @@ sub find_file($$)
   my $top = "." ;
   if (not "$pre") { $pre = "." ; }
 
-  for ( $str = "$pre" . "/" . "$top" ;
+  for ( my $str = "$pre" . "/" . "$top" ;
     ( -d "$str" ) ;
     $str = "$pre" . "/" . "$top" )
   {
-- 
cgit v1.2.3