gpsd-dev
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[gpsd-dev] [PATCH] Fixes cleaning and manpage building for ppscheck.


From: Fred Wright
Subject: [gpsd-dev] [PATCH] Fixes cleaning and manpage building for ppscheck.
Date: Wed, 10 Aug 2016 16:01:41 -0700

For cleaning (and helping) purposes, tiocmiwait can be set
unconditionally true, since the (usually nonexistent) program
can be cleaned on any platform.

This change also avoids building (and installing) the ppscheck
manpage when the program isn't being built.

TESTED:
Ran "scons build-all check", "sudo scons install",
"sudo scons uninstall", "scons -h", and "scons -c" on both OSX and
Linux, verifying correct behavior.
---
 SConstruct | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/SConstruct b/SConstruct
index a7ea225..4153cd7 100644
--- a/SConstruct
+++ b/SConstruct
@@ -99,9 +99,6 @@ systemd = os.path.exists(systemd_dir)
 # Set distribution-specific defaults here
 imloads = True
 
-# default tiocmiwait to off, until we know better
-tiocmiwait = False
-
 boolopts = (
     # GPS protocols
     ("nmea0183",      True,  "NMEA0183 support"),
@@ -623,6 +620,7 @@ if cleaning or helping:
     confdefs = []
     manbuilder = False
     htmlbuilder = False
+    tiocmiwait = True  # For cleaning, which works on any OS
 else:
 
     # If supported by the compiler, enable all warnings except uninitialized 
and
@@ -1557,8 +1555,11 @@ base_manpages = {
     "gpsdecode.1": "gpsdecode.xml",
     "srec.5": "srec.xml",
     "ntpshmmon.1": "ntpshmmon.xml",
-    "ppscheck.8": "ppscheck.xml",
     }
+if tiocmiwait:
+    base_manpages.update({
+    "ppscheck.8": "ppscheck.xml",
+    })
 python_manpages = {
     "gpsprof.1": "gpsprof.xml",
     "gpsfake.1": "gpsfake.xml",
-- 
2.9.2




reply via email to

[Prev in Thread] Current Thread [Next in Thread]