Skip to content

Commit 548a09a

Browse files
committed
fix: Determine the keycard lib based on a single param
this commit updates the makefile to determine some of the keycard lib link params based on a single argument - the lib path
1 parent a18039a commit 548a09a

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

Makefile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -549,13 +549,13 @@ status-keycard-qt-clean:
549549
ifeq ($(USE_STATUS_KEYCARD_QT),1)
550550
KEYCARD_LIB := $(STATUSKEYCARD_QT_LIB)
551551
KEYCARD_LIBDIR := $(STATUSKEYCARD_QT_LIBDIR)
552-
KEYCARD_LINKNAME := status-keycard-qt
553-
KEYCARD_DYLIB_NAME := libstatus-keycard-qt.dylib
552+
KEYCARD_DYLIB_NAME := $(notdir $(STATUSKEYCARD_QT_LIB))
553+
KEYCARD_LINKNAME := $(patsubst lib%,%,$(basename $(KEYCARD_DYLIB_NAME)))
554554
else
555555
KEYCARD_LIB := $(STATUSKEYCARDGO)
556556
KEYCARD_LIBDIR := $(STATUSKEYCARDGO_LIBDIR)
557-
KEYCARD_LINKNAME := keycard
558-
KEYCARD_DYLIB_NAME := libkeycard.$(LIB_EXT)
557+
KEYCARD_DYLIB_NAME := $(notdir $(STATUSKEYCARDGO))
558+
KEYCARD_LINKNAME := $(patsubst lib%,%,$(basename $(KEYCARD_DYLIB_NAME)))
559559
endif
560560

561561
QRCODEGEN := vendor/QR-Code-generator/c/libqrcodegen.a

0 commit comments

Comments
 (0)