From 695f516cbfd0b897d76ad21168dab58dafff7810 Mon Sep 17 00:00:00 2001
From: Andrew Johnson <anj@aps.anl.gov>
Date: Thu, 10 Dec 2015 13:26:21 -0600
Subject: [PATCH] Fix softIoc build with space in path to Base

Also improved error messages from makeInstallDir.pl.
---
 src/softIoc/Makefile          | 2 +-
 src/softIoc/makeInstallDir.pl | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/softIoc/Makefile b/src/softIoc/Makefile
index c3e867963..0ddf54187 100644
--- a/src/softIoc/Makefile
+++ b/src/softIoc/Makefile
@@ -33,7 +33,7 @@ softMain$(OBJ) : epicsInstallDir.h
 
 epicsInstallDir.h:
 	$(ECHO) "FINAL_LOCATION=$(FINAL_LOCATION)"
-	$(PERL) ../makeInstallDir.pl '$(FINAL_LOCATION)' > $@
+	$(PERL) ../makeInstallDir.pl "$(FINAL_LOCATION)" > $@
 
 clean::
 	@$(RM) epicsInstallDir.h
diff --git a/src/softIoc/makeInstallDir.pl b/src/softIoc/makeInstallDir.pl
index 96c305711..61f271f15 100644
--- a/src/softIoc/makeInstallDir.pl
+++ b/src/softIoc/makeInstallDir.pl
@@ -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;