Merged changes from Base-3.14, to revno 12613

This commit is contained in:
Andrew Johnson
2016-02-25 14:13:40 -06:00
15 changed files with 347 additions and 273 deletions

View File

@@ -17,5 +17,5 @@ softMain$(DEP): epicsInstallDir.h
epicsInstallDir.h:
$(ECHO) "FINAL_LOCATION=$(FINAL_LOCATION)"
$(PERL) $(STDDIR)/softIoc/makeInstallDir.pl '$(FINAL_LOCATION)' > $@
$(PERL) $(STDDIR)/softIoc/makeInstallDir.pl "$(FINAL_LOCATION)" > $@

View File

@@ -9,7 +9,8 @@ eval 'exec perl -S $0 ${1+"$@"}' # -*- Mode: perl -*-
use strict;
die "Path to INSTALL_LOCATION missing\n" unless @ARGV == 1;
die "$0: Argument missing, INSTALL_LOCATION\n" if @ARGV == 0;
die "$0: Too many arguments, expecting one\n" unless @ARGV == 1;
my $path = shift;