From 2a8908bdcf89b1cc8a332033bc9f8971b82438a3 Mon Sep 17 00:00:00 2001 From: James McCoy Date: Thu, 21 Jul 2016 23:30:32 -0400 Subject: [PATCH] Find libmsgpackc in Multi-Arch library paths The msgpack library may be present in /usr/lib or /usr/lib/$arch, but only the former is being searched. Check both places and fix the library name to use the C lib (libmsgpackc) rather than the C++ lib (libmsgpack). Signed-off-by: James McCoy --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 40a7787..11bd9cd 100644 --- a/Makefile +++ b/Makefile @@ -14,11 +14,11 @@ ifneq ($(findstring yes,$(shell pkg-config --exists msgpack && echo yes)),) CFLAGS += -DMSGPACK=1 $(shell pkg-config --cflags msgpack) LDFLAGS += $(shell pkg-config --libs msgpack) else - MSGPACK_LIB=$(shell ls /usr/lib/libmsgpack.so 2>/dev/null) + MSGPACK_LIB=$(shell ls /usr/lib/libmsgpackc.so /usr/lib/*/libmsgpackc.so 2>/dev/null) ifneq ($(strip $(MSGPACK_LIB)),) FORMAT_OBJS += formats/msgpack.o CFLAGS += -DMSGPACK=1 - LDFLAGS += -lmsgpack + LDFLAGS += -lmsgpackc endif endif