From 00db17adb49ab5bf3ac29ba2fed2c210a208b8f7 Mon Sep 17 00:00:00 2001
From: Janet Anderson <jba@aps.anl.gov>
Date: Mon, 27 Sep 2010 16:37:13 -0500
Subject: [PATCH] Added FINAL_LOCATION code.

---
 src/softIoc/Makefile          | 17 ++++++++++-------
 src/softIoc/makeInstallDir.pl |  2 +-
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/softIoc/Makefile b/src/softIoc/Makefile
index 001202793..e1f2ee83d 100644
--- a/src/softIoc/Makefile
+++ b/src/softIoc/Makefile
@@ -9,12 +9,8 @@ TOP=../..
 
 include $(TOP)/configure/CONFIG
 
-PERL_SCRIPTS += makeInstallDir.pl
-
 PROD_IOC = softIoc
 
-INC += epicsInstallDir.h
-
 DBD += softIoc.dbd
 softIoc_DBD += base.dbd
 softIoc_DBD += dlload.dbd
@@ -28,9 +24,16 @@ softIoc_LIBS = $(EPICS_BASE_IOC_LIBS)
 
 DB += softIocExit.db
 
+FINAL_LOCATION ?= $(shell $(PERL) $(TOOLS)/fullPathName.pl $(INSTALL_LOCATION))
+
 include $(TOP)/configure/RULES
 
-softMain$(OBJ) : $(COMMON_DIR)/epicsInstallDir.h
+softMain$(OBJ) : epicsInstallDir.h
+
+epicsInstallDir.h:
+	@echo "FINAL_LOCATION=$(FINAL_LOCATION)"
+	$(PERL) ../makeInstallDir.pl $(FINAL_LOCATION) > $@
+
+clean::
+	@$(RM) epicsInstallDir.h
 
-$(COMMON_DIR)/epicsInstallDir.h: $(INSTALL_BIN)/makeInstallDir.pl
-	$(PERL) $< $(INSTALL_LOCATION) > $@
diff --git a/src/softIoc/makeInstallDir.pl b/src/softIoc/makeInstallDir.pl
index 88dc8b88c..f60d80d45 100644
--- a/src/softIoc/makeInstallDir.pl
+++ b/src/softIoc/makeInstallDir.pl
@@ -16,7 +16,7 @@ use EPICS::Path;
 
 die "Path to INSTALL_LOCATION missing\n" unless @ARGV == 1;
 
-my $path = AbsPath(shift);
+my $path = shift;
 
 $path =~ s/\\/\\\\/gx;