From 7b644a2ace47e43772006764a58166b6635e8941 Mon Sep 17 00:00:00 2001 From: Nick Papior Date: Thu, 23 Nov 2023 13:56:29 +0100 Subject: [PATCH] fixed pkgconfig build-problem with non-absolute paths Signed-off-by: Nick Papior --- Makefile.project | 2 +- flook.pc.in | 6 +++--- smeka/Makefile.pkgconfig | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Makefile.project b/Makefile.project index 021623e..4859c8a 100644 --- a/Makefile.project +++ b/Makefile.project @@ -6,7 +6,7 @@ _SMEKA_project = 1 # Step this version upon new versions PROJECT_MAJOR = 0 PROJECT_MINOR = 8 -PROJECT_MICRO = 3 +PROJECT_MICRO = 4 PROJECT_VERSION = $(PROJECT_MAJOR).$(PROJECT_MINOR).$(PROJECT_MICRO) # These are constant default diff --git a/flook.pc.in b/flook.pc.in index 9bfa68f..d10cdfe 100644 --- a/flook.pc.in +++ b/flook.pc.in @@ -1,8 +1,8 @@ prefix=@PREFIX@ exec_prefix=${prefix} -bindir=@BIN_DIR@ -includedir=@INC_DIR@ -libdir=@LIB_DIR@ +bindir=${prefix}/@BIN_DIR@ +includedir=${prefix}/@INC_DIR@ +libdir=${prefix}/@LIB_DIR@ Name: @PROJECT_NAME@ Description: Fortran-Lua hook library to control flow from scripting language. diff --git a/smeka/Makefile.pkgconfig b/smeka/Makefile.pkgconfig index b6b87c3..9c72fac 100644 --- a/smeka/Makefile.pkgconfig +++ b/smeka/Makefile.pkgconfig @@ -27,8 +27,8 @@ smeka-pkgconfig-init-dir: smeka-install-init-dir .PHONY: smeka-pkgconfig .NOTPARALLEL: smeka-pkgconfig smeka-pkgconfig: smeka-pkgconfig-init-dir - $(SED) "s:@PREFIX@:$(PREFIX):g;\ - s:@CMAKE_INSTALL_PREFIX@:$(PREFIX):g;\ + $(SED) "s:@PREFIX@:$(realpath $(PREFIX)):g;\ + s:@CMAKE_INSTALL_PREFIX@:$(realpath $(PREFIX)):g;\ s:@PROJECT_NAME@:$(PROJECT_NAME):g;\ s:@PROJECT_VERSION@:$(PROJECT_VERSION):g;\ s:@INC_DIR@:$(INC_DIR):g;\