From 55c97cd029af9c07cd0532f9293995e03d56258b Mon Sep 17 00:00:00 2001
From: Dirk Zimoch <dirk.zimoch@psi.ch>
Date: Wed, 30 Aug 2023 09:54:26 +0200
Subject: [PATCH] fix for the fix: while realpath caused problems with links,
 abspath is still needed or install cannot find all headers

---
 App/tools/driver.makefile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/App/tools/driver.makefile b/App/tools/driver.makefile
index be75a4a..64421db 100644
--- a/App/tools/driver.makefile
+++ b/App/tools/driver.makefile
@@ -410,19 +410,19 @@ HDRS = ${RECORDS:%=${COMMON_DIR}/%.h} ${MENUS:%=${COMMON_DIR}/%.h}
 HDRSX = ${HEADERS}
 HDRSX += ${HEADERS_${EPICS_BASETYPE}}
 HDRSX += ${HEADERS_${EPICSVERSION}}
-HDRS += $(call filter_out_dir,${HDRSX})
+HDRS += $(call filter_out_dir,$(abspath ${HDRSX}))
 export HDRS
 
 TEMPLSX = $(if ${TEMPLATES},$(filter-out -none-,${TEMPLATES}),$(wildcard *.template *.db *.subs))
 TEMPLSX += ${TEMPLATES_${EPICS_BASETYPE}}
 TEMPLSX += ${TEMPLATES_${EPICSVERSION}}
-TEMPLS = $(call filter_out_dir,${TEMPLSX})
+TEMPLS = $(call filter_out_dir,$(abspath ${TEMPLSX}))
 export TEMPLS
 
 SCRX = $(if ${SCRIPTS},$(filter-out -none-,${SCRIPTS}),$(wildcard *.cmd *.iocsh))
 SCRX += ${SCRIPTS_${EPICS_BASETYPE}}
 SCRX += ${SCRIPTS_${EPICSVERSION}}
-SCR = $(call filter_out_dir,${SCRX})
+SCR = $(call filter_out_dir,$(abspath ${SCRX}))
 export SCR
 
 DOCUDIR = .
@@ -518,7 +518,7 @@ export VAR_EXTENSIONS
 REQ = ${REQUIRED} $(foreach x, ${VAR_EXTENSIONS}, ${REQUIRED_$x})
 export REQ
 
-HDRS +=  $(foreach x, ${VAR_EXTENSIONS}, $(call filter_out_dir,${HEADERS_$x}))
+HDRS +=  $(foreach x, ${VAR_EXTENSIONS}, $(call filter_out_dir,$(abspath ${HEADERS_$x})))
 export HDRS
 
 SRCS += $(foreach x, ${VAR_EXTENSIONS}, ${SOURCES_$x})