summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2011-06-18 22:09:38 (GMT)
committerRemko Tronçon <git@el-tramo.be>2011-06-18 22:09:38 (GMT)
commita23b90319f9de8db0b455f5cd56e2428a3fcc53b (patch)
tree95d5baed116136cc214d8e1b5c49136b4abded5f /Swiften/SConscript
parentce4eb88be2eba12d5580bb22b48af3a0e915363b (diff)
parent5b88d16b2ea7edfbc1487751fb95f128b2c30330 (diff)
downloadswift-contrib-a23b90319f9de8db0b455f5cd56e2428a3fcc53b.zip
swift-contrib-a23b90319f9de8db0b455f5cd56e2428a3fcc53b.tar.bz2
Merge branch 'swift-1.x'
* swift-1.x: Fixed Debian manpages installation. Use LibXML as a Debian source dependency (instead of Expat) Tweak help documentation and add manpages. Conflicts: Swift/QtUI/QtSwift.cpp
Diffstat (limited to 'Swiften/SConscript')
-rw-r--r--Swiften/SConscript1
1 files changed, 1 insertions, 0 deletions
diff --git a/Swiften/SConscript b/Swiften/SConscript
index f8392a8..d98c9b7 100644
--- a/Swiften/SConscript
+++ b/Swiften/SConscript
@@ -394,6 +394,7 @@ if env["SCONS_STAGE"] == "build" :
version_header = "#pragma once\n\n"
version_header += "#define SWIFTEN_VERSION 0x%02X%02X%02X\n" % (swiften_env["SWIFTEN_VERSION_MAJOR"], swiften_env["SWIFTEN_VERSION_MINOR"], swiften_env["SWIFTEN_VERSION_PATCH"])
+ version_header += "#define SWIFTEN_VERSION_STRING \"%s\"\n" % swiften_env["SWIFTEN_VERSION"]
swiften_env.WriteVal("Version.h", swiften_env.Value(version_header))
swiften_includes.append("Swiften/Version.h")