From 64e280e20b3d46b9ddb8369011613fd7722f2b6b Mon Sep 17 00:00:00 2001 From: CK Tan Date: Thu, 16 Dec 2021 13:36:32 -0800 Subject: [PATCH] fix: Makefile install prefix missing for libtoml.pc #68 --- Makefile | 6 ++++-- libtoml.pc => libtoml.pc.sample | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) rename libtoml.pc => libtoml.pc.sample (82%) diff --git a/Makefile b/Makefile index 93fcb29..1ca63f2 100644 --- a/Makefile +++ b/Makefile @@ -1,3 +1,4 @@ +prefix ?= /usr/local HFILES = toml.h CFILES = toml.c OBJ = $(CFILES:.c=.o) @@ -35,14 +36,15 @@ toml_cat: toml_cat.c $(LIB) toml_sample: toml_sample.c $(LIB) -prefix ?= /usr/local install: all install -d ${prefix}/include ${prefix}/lib install toml.h ${prefix}/include install $(LIB) ${prefix}/lib install $(LIB_SHARED) ${prefix}/lib - install $(PCFILE) /usr/lib/pkgconfig +ifeq "$(prefix)" "/usr/local" + install $(PCFILE) /usr/local/lib/pkgconfig +endif clean: rm -f *.o $(EXEC) $(LIB) $(LIB_SHARED) diff --git a/libtoml.pc b/libtoml.pc.sample similarity index 82% rename from libtoml.pc rename to libtoml.pc.sample index 62e7ecb..e343634 100644 --- a/libtoml.pc +++ b/libtoml.pc.sample @@ -1,4 +1,4 @@ -prefix=/usr/local/ +prefix=/usr/local exec_prefix=${prefix} libdir=${exec_prefix}/lib includedir=${prefix}/include @@ -8,4 +8,4 @@ URL: https://github.com/cktan/tomlc99/ Description: TOML C library in c99. Version: v1.0 Libs: -L${libdir} -ltoml -Cflags: -I${includedir} +Cflags: -I${includedir}