From ecd7d5a9cef6a343be339219599f4c83eb4ceb9b Mon Sep 17 00:00:00 2001 From: Andrew Johnson Date: Mon, 17 May 2004 21:43:50 +0000 Subject: [PATCH] configure/tools provides a replacement for absPath.pl, use that instead. --- src/softIoc/Makefile | 3 ++- src/softIoc/absPath.pl | 16 ---------------- 2 files changed, 2 insertions(+), 17 deletions(-) delete mode 100644 src/softIoc/absPath.pl diff --git a/src/softIoc/Makefile b/src/softIoc/Makefile index 49d027393..426e2f3e4 100644 --- a/src/softIoc/Makefile +++ b/src/softIoc/Makefile @@ -18,7 +18,8 @@ PROD_IOC_vxWorks = -nil- DBD += softIoc.dbd softIoc_DBD += base.dbd -USR_CXXFLAGS += -DEPICS_BASE=$(shell $(PERL) ../absPath.pl $(INSTALL_LOCATION)) +ABS_INSTALL_DIR = $(shell $(PERL) $(TOOLS)/fullPathName.pl $(INSTALL_LOCATION)) +USR_CXXFLAGS += -DEPICS_BASE=$(ABS_INSTALL_DIR) softIoc_SRCS += softIoc_registerRecordDeviceDriver.cpp softIoc_SRCS += softMain.cpp diff --git a/src/softIoc/absPath.pl b/src/softIoc/absPath.pl deleted file mode 100644 index 4170efb87..000000000 --- a/src/softIoc/absPath.pl +++ /dev/null @@ -1,16 +0,0 @@ -#!/usr/bin/perl -#************************************************************************* -# Copyright (c) 2002 The University of Chicago, as Operator of Argonne -# National Laboratory. -# Copyright (c) 2002 The Regents of the University of California, as -# Operator of Los Alamos National Laboratory. -# EPICS BASE Versions 3.13.7 -# and higher are distributed subject to a Software License Agreement found -# in file LICENSE that is included with this distribution. -#************************************************************************* - -use Cwd; - -chdir $ARGV[0]; - -print cwd();