From 0686e9a51c92ebea59017e94178ae379d3524eda Mon Sep 17 00:00:00 2001 From: Paul LeoNerd Evans Date: Fri, 1 Jul 2011 17:04:12 +0100 Subject: [PATCH] Put LIBDIR and INCDIR directly in termkey.pc; don't indirect via PREFIX as it might be incorrect --- Makefile | 2 +- termkey.pc.in | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 6c12a08..78913a5 100644 --- a/Makefile +++ b/Makefile @@ -52,7 +52,7 @@ install-inc: install -d $(DESTDIR)$(INCDIR) install -m644 termkey.h $(DESTDIR)$(INCDIR) install -d $(DESTDIR)$(LIBDIR)/pkgconfig - sed "s,@PREFIX@,$(PREFIX)," $(DESTDIR)$(LIBDIR)/pkgconfig/termkey.pc + sed "s,@LIBDIR@,$(LIBDIR),;s,@INCDIR@,$(INCDIR)," $(DESTDIR)$(LIBDIR)/pkgconfig/termkey.pc install-lib: install -d $(DESTDIR)$(LIBDIR) diff --git a/termkey.pc.in b/termkey.pc.in index 4c0eb8f..31113be 100644 --- a/termkey.pc.in +++ b/termkey.pc.in @@ -1,6 +1,5 @@ -prefix=@PREFIX@ -libdir=${prefix}/lib -includedir=${prefix}/include +libdir=@LIBDIR@ +includedir=@INCDIR@ Name: termkey Description: Abstract terminal key input library