diff --git a/src/softIoc/Makefile b/src/softIoc/Makefile index e1f2ee83d..11fecd3b3 100644 --- a/src/softIoc/Makefile +++ b/src/softIoc/Makefile @@ -31,7 +31,7 @@ include $(TOP)/configure/RULES softMain$(OBJ) : epicsInstallDir.h epicsInstallDir.h: - @echo "FINAL_LOCATION=$(FINAL_LOCATION)" + $(ECHO) "FINAL_LOCATION=$(FINAL_LOCATION)" $(PERL) ../makeInstallDir.pl $(FINAL_LOCATION) > $@ clean:: diff --git a/src/softIoc/makeInstallDir.pl b/src/softIoc/makeInstallDir.pl index f60d80d45..c9d6d2a75 100644 --- a/src/softIoc/makeInstallDir.pl +++ b/src/softIoc/makeInstallDir.pl @@ -1,7 +1,7 @@ eval 'exec perl -S $0 ${1+"$@"}' # -*- Mode: perl -*- - if $running_under_some_shell; # registerRecordDeviceDriver + if $running_under_some_shell; #************************************************************************* -# Copyright (c) 2009 UChicago Argonne LLC, as Operator of Argonne +# Copyright (c) 2010 UChicago Argonne LLC, as Operator of Argonne # National Laboratory. # EPICS BASE is distributed subject to a Software License Agreement found # in file LICENSE that is included with this distribution. @@ -9,11 +9,6 @@ eval 'exec perl -S $0 ${1+"$@"}' # -*- Mode: perl -*- use strict; -use FindBin qw($Bin); -use lib "$Bin/../../lib/perl"; - -use EPICS::Path; - die "Path to INSTALL_LOCATION missing\n" unless @ARGV == 1; my $path = shift; @@ -28,4 +23,3 @@ print "/* THIS IS A GENERATED FILE. DO NOT EDIT! */\n", "#define EPICS_BASE \"$path\"\n", "\n", "#endif /* INC_epicsInstallDir_H */\n"; -