From 61f1e8b12f13d7061965da4dc3e097780fb358a2 Mon Sep 17 00:00:00 2001 From: Marty Kraimer Date: Fri, 10 Oct 1997 14:22:14 +0000 Subject: [PATCH] still original --- src/makeBaseApp/makeBaseApp.pl | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/makeBaseApp/makeBaseApp.pl b/src/makeBaseApp/makeBaseApp.pl index 740e1784b..f84ee24f5 100755 --- a/src/makeBaseApp/makeBaseApp.pl +++ b/src/makeBaseApp/makeBaseApp.pl @@ -27,11 +27,13 @@ if(!("opt_i" || "opt_e") && "opt_a") { #locate epics_base if($opt_b) { #first choice is -b base $epics_base = $opt_b; -} elsif(-d config) { #second choice is config/RELEASE +} elsif(-r "config/RELEASE") { #second choice is config/RELEASE open(IN,"config/RELEASE") or die "Cannot open config/RELEASE"; while ($line = ) { + chomp($line); if($line =~ /EPICS_BASE/) { - $epics_base = ($line =~ s/EPICS_BASE=//); + $line =~ s/EPICS_BASE=//; + $epics_base = $line; break; } } @@ -94,7 +96,7 @@ if($opt_i || $opt_e) { #Create ioc directories print "What architecture do you want to use for your IOC,"; print "e.g. pc486, mv167 ? "; $arch=; - chomp $arch; + chomp($arch); } open(IN,"${fromDir}/Makefile") or die "Cannot open ${fromDir}/Makefile"; open OUT, ">${toDir}/Makefile" or die "Cannot create ${toDir}/Makefile";