Use correct paths in pc files

Previously, the paths in the pkgconfig files were hardcoded resulting
in broken include paths on NixOS.

This patch replaces the paths with placeholders that will be changed
during making.

diff --git a/Make.defaults b/Make.defaults
index 102b41f..634ea5e 100644 (file)
--- a/Make.defaults
+++ b/Make.defaults
@@ -1,9 +1,10 @@
 prefix ?= /usr/
-libdir ?= $(prefix)/lib64/
+exec_prefix    ?= $(prefix)
+libdir ?= $(exec_prefix)/lib64/
 datadir        ?= $(prefix)/share/
 mandir ?= $(datadir)/man/
 includedir ?= $(prefix)/include/
-bindir ?= $(prefix)/bin/
+bindir ?= $(exec_prefix)/bin/
 PCDIR  ?= $(libdir)/pkgconfig/
 DESTDIR        ?=
 

diff --git a/Make.rules b/Make.rules
index 50483a8..54dec07 100644 (file)
--- a/Make.rules
+++ b/Make.rules
@@ -56,6 +56,9 @@ define substitute-version
        sed                                             \
                -e "s,@@VERSION@@,$(VERSION),g"         \
                -e "s,@@LIBDIR@@,$(libdir),g"           \
+               -e "s,@@PREFIX@@,$(prefix),g"           \
+               -e "s,@@EXEC_PREFIX@@,$(exec_prefix),g"         \
+               -e "s,@@INCLUDEDIR@@,$(includedir),g"           \
                $(1) > $(2)
 endef
 

diff --git a/src/efiboot.pc.in b/src/efiboot.pc.in
index e6ffc14..94cace4 100644 (file)
--- a/src/efiboot.pc.in
+++ b/src/efiboot.pc.in
@@ -1,7 +1,7 @@
-prefix=/usr
-exec_prefix=/usr
+prefix=@@PREFIX@@
+exec_prefix=@@EXEC_PREFIX@@
 libdir=@@LIBDIR@@
-includedir=/usr/include
+includedir=@@INCLUDEDIR@@
 
 Name: efiboot
 Description: UEFI Boot variable support

diff --git a/src/efivar.pc.in b/src/efivar.pc.in
index 1ea7deb..a7f9a39 100644 (file)
--- a/src/efivar.pc.in
+++ b/src/efivar.pc.in
@@ -1,7 +1,7 @@
-prefix=/usr
-exec_prefix=/usr
+prefix=@@PREFIX@@
+exec_prefix=@@EXEC_PREFIX@@
 libdir=@@LIBDIR@@
-includedir=/usr/include
+includedir=@@INCLUDEDIR@@
 
 Name: efivar
 Description: UEFI Variable Management