Skip to content

Commit

Permalink
fix wrong paths showing up in pkg-config files
Browse files Browse the repository at this point in the history
-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
  • Loading branch information
DerDakon authored and eric-s-raymond committed Sep 7, 2017
1 parent 66df930 commit badbbf7
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 5 deletions.
4 changes: 2 additions & 2 deletions Qgpsmm.pc.in
Original file line number Diff line number Diff line change
@@ -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
Expand Down
3 changes: 2 additions & 1 deletion SConstruct
Original file line number Diff line number Diff line change
Expand Up @@ -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'),
Expand Down
4 changes: 2 additions & 2 deletions libgps.pc.in
Original file line number Diff line number Diff line change
@@ -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
Expand Down

0 comments on commit badbbf7

Please sign in to comment.