Index: SConstruct
--- SConstruct.orig
+++ SConstruct
@@ -513,7 +513,7 @@ def CheckPKG(context, name):
# Stylesheet URLs for making HTML and man pages from DocBook XML.
-docbook_url_stem = 'http://docbook.sourceforge.net/release/xsl/current/'
+docbook_url_stem = '${LOCALBASE}/share/xsl/docbook/'
docbook_man_uri = docbook_url_stem + 'manpages/docbook.xsl'
docbook_html_uri = docbook_url_stem + 'html/docbook.xsl'
@@ -941,7 +941,10 @@ else:
# Determine if Qt network libraries are present, and
# if not, force qt to off
if env["qt"]:
- qt_net_name = 'Qt%sNetwork' % env["qt_versioned"]
+ if env["qt_versioned"] == "5":
+ qt_net_name = 'Qt5Network'
+ elif env["qt_versioned"] == "4":
+ qt_net_name = 'QtNetwork'
qt_network = config.CheckPKG(qt_net_name)
if not qt_network:
env["qt"] = False
@@ -1092,8 +1095,7 @@ if env['coveraging'] and env['python_coverage'] and no
# Two shared libraries provide most of the code for the C programs
libgps_version_soname = libgps_version_current - libgps_version_age
-libgps_version = "%d.%d.%d" % (libgps_version_soname, libgps_version_age,
- libgps_version_revision)
+libgps_version = "%d.%d" %(libgps_version_soname, libgps_version_revision)
libgps_sources = [
"ais_json.c",
@@ -1463,9 +1465,7 @@ else:
python_objects[ext].append(
python_env.NoCache(
python_env.SharedObject(
- src.split(".")[0] + '-py_' +
- '_'.join(['%s' % (x) for x in sys.version_info]) +
- python_config['SO'], src
+ src.split(".")[0] + python_config['SO'], src
)
)
)
@@ -1697,7 +1697,6 @@ if tiocmiwait:
})
python_manpages = {
- "gegps.1": "gps.xml",
"gpscat.1": "gpscat.xml",
"gpsfake.1": "gpsfake.xml",
"gpsprof.1": "gpsprof.xml",