Re: spurious install of ${prefix}/include/gps.h

[Greg Troxel]

A further datapoint.  In trying to find out why the
${prefix}/include/gps.h target is added to the build target, I changed
the pathnames related to headers in two places.  The behavior remains
the same, still attempting to install to "include".

diff --git a/SConscript b/SConscript
index ef9b78e18..a699a3e85 100644
--- a/SConscript
+++ b/SConscript
@@ -419,7 +419,7 @@ pathopts = (
     ("bindir",       "bin",                "application binaries directory"),
     ("docdir",       "share/gpsd/doc",     "documents directory"),
     ("icondir",      "share/gpsd/icons",   "icon directory"),
-    ("includedir",   "include",            "header file directory"),
+    ("includedir",   "inclu",            "header file directory"),
     ("libdir",       "lib",                "system libraries"),
     ("mandir",       "share/man",          "manual pages directory"),
     ("pkgconfig",    "$libdir/pkgconfig",  "pkgconfig file directory"),
@@ -2447,7 +2447,7 @@ if qt_env:
 # It's deliberate that we don't install gpsd.h. It's full of internals that
 # third-party client programs should not see.
 headerinstall = [env.Install(installdir('includedir'), x)
-                 for x in ("include/libgpsmm.h", "include/gps.h")]
+                 for x in ("include/libgpsmm.h", "includ/gps.h")]
 
 binaryinstall = []
 binaryinstall.append(env.Install(installdir('sbindir'), sbin_binaries))

signature.asc
Description: PGP signature