From: Kentaro Hayashi Date: Sat, 25 May 2024 19:51:42 +0900 Subject: Fix installed path of epics headers Description: epics-dev installs upstream's header under /usr/include/epics/ explicitly, so it should be also changed. Without this change, pkg-config can't return correct header search path. Author: Kentaro Hayashi Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1059706#38 Forwarded: no --- modules/database/src/tools/epics-base-arch.pc@ | 9 +++++---- modules/database/src/tools/epics-base.pc@ | 7 ++++--- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/modules/database/src/tools/epics-base-arch.pc@ b/modules/database/src/tools/epics-base-arch.pc@ index 7dde33d..f2957f0 100644 --- a/modules/database/src/tools/epics-base-arch.pc@ +++ b/modules/database/src/tools/epics-base-arch.pc@ @@ -18,10 +18,11 @@ EPICS_BASE_IOC_LIBS=@EPICS_BASE_IOC_LIBS@ # Directories includedir_osi=${prefix}/include -includedir_osd=${prefix}/include/os/@OS_CLASS@ -includedir_comp=${prefix}/include/compiler/@CMPLR_CLASS@ +includedir_epicsd=${prefix}/include/epics +includedir_osd=${prefix}/include/epics/os/@OS_CLASS@ +includedir_comp=${prefix}/include/epics/compiler/@CMPLR_CLASS@ -includedirs=${includedir_osi} ${includedir_osd} ${includedir_comp} +includedirs=${includedir_osi} ${includedir_epicsd} ${includedir_osd} ${includedir_comp} dbddir=${prefix}/dbd dbdir=${prefix}/db @@ -37,6 +38,6 @@ LD=@LD@ Name: epics-base-@ARCH@ Version: @EPICS_VERSION@.@EPICS_REVISION@.@EPICS_MODIFICATION@.@EPICS_PATCH_LEVEL@ Description: EPICS Base for @ARCH@ -Cflags: -I${includedir_osi} -I${includedir_osd} -I${includedir_comp} @C_CFLAGS@ +Cflags: -I${includedir_osi} -I${includedir_epicsd} -I${includedir_osd} -I${includedir_comp} Libs: -L${libdir} @LDFLAGS@ Libs.private: @LDLIBS@ diff --git a/modules/database/src/tools/epics-base.pc@ b/modules/database/src/tools/epics-base.pc@ index c154066..217748d 100644 --- a/modules/database/src/tools/epics-base.pc@ +++ b/modules/database/src/tools/epics-base.pc@ @@ -15,10 +15,11 @@ CMPLR_CLASS=@CMPLR_CLASS@ # Directories includedir_osi=${prefix}/include -includedir_osd=${prefix}/include/os/@OS_CLASS@ -includedir_comp=${prefix}/include/compiler/@CMPLR_CLASS@ +includedir_epicsd=${prefix}/include/epics +includedir_osd=${prefix}/include/epics/os/@OS_CLASS@ +includedir_comp=${prefix}/include/epics/compiler/@CMPLR_CLASS@ -includedirs=${includedir_osi} ${includedir_osd} ${includedir_comp} +includedirs=${includedir_osi} ${includedir_epicsd} ${includedir_osd} ${includedir_comp} dbddir=${prefix}/dbd dbdir=${prefix}/db