version 1.3, 2019/06/11 15:34:46 |
version 1.4, 2019/06/20 06:16:41 |
|
|
Index: SConstruct |
Index: SConstruct |
--- SConstruct.orig |
--- SConstruct.orig |
+++ SConstruct |
+++ SConstruct |
@@ -513,7 +513,7 @@ def CheckPKG(context, name): |
@@ -529,7 +529,7 @@ def CheckPKG(context, name): |
|
|
|
|
# Stylesheet URLs for making HTML and man pages from DocBook XML. |
# Stylesheet URLs for making HTML and man pages from DocBook XML. |
|
|
docbook_man_uri = docbook_url_stem + 'manpages/docbook.xsl' |
docbook_man_uri = docbook_url_stem + 'manpages/docbook.xsl' |
docbook_html_uri = docbook_url_stem + 'html/docbook.xsl' |
docbook_html_uri = docbook_url_stem + 'html/docbook.xsl' |
|
|
@@ -941,7 +941,10 @@ else: |
@@ -957,7 +957,10 @@ else: |
# Determine if Qt network libraries are present, and |
# Determine if Qt network libraries are present, and |
# if not, force qt to off |
# if not, force qt to off |
if env["qt"]: |
if env["qt"]: |
|
|
qt_network = config.CheckPKG(qt_net_name) |
qt_network = config.CheckPKG(qt_net_name) |
if not qt_network: |
if not qt_network: |
env["qt"] = False |
env["qt"] = False |
@@ -1092,8 +1095,7 @@ if env['coveraging'] and env['python_coverage'] and no |
@@ -1108,8 +1111,7 @@ if env['coveraging'] and env['python_coverage'] and no |
# Two shared libraries provide most of the code for the C programs |
# Two shared libraries provide most of the code for the C programs |
|
|
libgps_version_soname = libgps_version_current - libgps_version_age |
libgps_version_soname = libgps_version_current - libgps_version_age |
-libgps_version = "%d.%d.%d" % (libgps_version_soname, libgps_version_age, |
-libgps_version = "%d.%d.%d" % (libgps_version_soname, libgps_version_age, |
- libgps_version_revision) |
- libgps_version_revision) |
+libgps_version = "%d.%d" %(libgps_version_soname, libgps_version_revision) |
+libgps_version = "%s" % ('${LIBgps_VERSION}') |
|
|
libgps_sources = [ |
libgps_sources = [ |
"ais_json.c", |
"ais_json.c", |
@@ -1463,9 +1465,7 @@ else: |
@@ -1519,9 +1521,7 @@ else: |
python_objects[ext].append( |
python_objects[ext].append( |
python_env.NoCache( |
python_env.NoCache( |
python_env.SharedObject( |
python_env.SharedObject( |
|
|
) |
) |
) |
) |
) |
) |
@@ -1697,7 +1697,6 @@ if tiocmiwait: |
|
}) |
|
|
|
python_manpages = { |
|
- "gegps.1": "gps.xml", |
|
"gpscat.1": "gpscat.xml", |
|
"gpsfake.1": "gpsfake.xml", |
|
"gpsprof.1": "gpsprof.xml", |
|