From badbbf775299b48c7cf83b48a4e87bf29ef49f7d Mon Sep 17 00:00:00 2001
From: Rolf Eike Beer <eb@emlix.com>
Date: Thu, 7 Sep 2017 09:18:23 +0200
Subject: [PATCH] fix wrong paths showing up in pkg-config files

-the wrong libdir path was written if a full path is passed to scons instead of
 one relative to "prefix", i.e. "/usr/lib64" instead of "lib64"
-the includedir passed to scons was entirely ignored
---
 Qgpsmm.pc.in | 4 ++--
 SConstruct   | 3 ++-
 libgps.pc.in | 4 ++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/Qgpsmm.pc.in b/Qgpsmm.pc.in
index 7587e8b7..c3006d50 100644
--- a/Qgpsmm.pc.in
+++ b/Qgpsmm.pc.in
@@ -1,7 +1,7 @@
 prefix=@prefix@
 exec_prefix=${prefix}
-libdir=${exec_prefix}@libdir@
-includedir=${prefix}/include
+libdir=@libdir@
+includedir=@includedir@
 qt_config=lex yacc warn_on uic resources qt release incremental link_prl def_files_disabled exceptions no_mocdepend stl qt_no_framework create_pc create_prl moc thread dll
 
 Name: Qgpsmm
diff --git a/SConstruct b/SConstruct
index 9ebf359c..c0a4345a 100644
--- a/SConstruct
+++ b/SConstruct
@@ -1509,7 +1509,8 @@ def substituter(target, source, env):
     substmap = (
         ('@VERSION@',    gpsd_version),
         ('@prefix@',     env['prefix']),
-        ('@libdir@',     env['libdir']),
+        ('@libdir@',     installdir('libdir', add_destdir=False)),
+        ('@includedir@',     installdir('includedir', add_destdir=False)),
         ('@udevcommand@',    udevcommand),
         ('@DATE@',       time.asctime()),
         ('@MASTER@',     'DO NOT HAND_HACK! THIS FILE IS GENERATED'),
diff --git a/libgps.pc.in b/libgps.pc.in
index 1bff05d1..0ecb2e51 100644
--- a/libgps.pc.in
+++ b/libgps.pc.in
@@ -1,7 +1,7 @@
 prefix=@prefix@
 exec_prefix=${prefix}
-libdir=${exec_prefix}/@libdir@
-includedir=${prefix}/include
+libdir=@libdir@
+includedir=@includedir@
 
 Name: GPSD
 Description: GPS Daemon communication library