Added FINAL_LOCATION code.
This commit is contained in:
@@ -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) > $@
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user