Skip to content

Commit

Permalink
build: Don't strip /lib out of arbitrary paths (#31)
Browse files Browse the repository at this point in the history
* 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.
  • Loading branch information
agx authored Sep 16, 2023
1 parent da1b445 commit 1e47049
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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}'
Expand All @@ -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
Expand Down

0 comments on commit 1e47049

Please sign in to comment.