From 1e47049b7728c3e4312ad3e39e11f3ae5e19e7dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guido=20G=C3=BCnther?= Date: Sat, 16 Sep 2023 23:58:22 +0200 Subject: [PATCH] build: Don't strip /lib out of arbitrary paths (#31) * build: Fix indent * build: Don't strip /lib out of arbitrary paths The current sed expression matches on all paths elements so if one has it's development e.g. in /var/scratch/librem5/ it would truncate the patch to /var/scratchrem5/ which then fails the build. Fix that by only matching at the end of paths to remove /lib from the libdir. --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index c94b26b..24b5127 100644 --- a/Makefile +++ b/Makefile @@ -19,7 +19,7 @@ LIB_NAME := libgovarnam.so ifeq ($(UNAME), Darwin) SED := sed -i "" - LIB_NAME = libgovarnam.dylib + LIB_NAME = libgovarnam.dylib endif VERSION_STAMP_LDFLAGS := -X 'github.com/varnamproject/govarnam/govarnam.BuildString=${BUILDSTR}' -X 'github.com/varnamproject/govarnam/govarnam.VersionString=${VERSION}' @@ -36,7 +36,7 @@ temp-pc: ${SED} "s#@VERSION@#${VERSION}#g" govarnam.pc ${SED} "s#/include/libgovarnam##g" govarnam.pc - ${SED} "s#/lib##g" govarnam.pc + ${SED} "s#/lib\$$##g" govarnam.pc install-script: cp install.sh.in install.sh