Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2011-04-30 08:06:20 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2011-04-30 08:06:20 (GMT) |
| commit | dcd86c07e1ecccec63d9076a1ad2f9caf09067c0 (patch) | |
| tree | 99234e39cb9d18e9c7803dbd72467ed36e0c720d | |
| parent | 471f0a1bb6d419a2e919e9060a6f966269d8ab6c (diff) | |
| download | swift-contrib-dcd86c07e1ecccec63d9076a1ad2f9caf09067c0.zip swift-contrib-dcd86c07e1ecccec63d9076a1ad2f9caf09067c0.tar.bz2 | |
Substitute SCons variables correctly.
| -rw-r--r-- | Swiften/SConscript | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/Swiften/SConscript b/Swiften/SConscript index 9c91c0d..17294f9 100644 --- a/Swiften/SConscript +++ b/Swiften/SConscript @@ -20,17 +20,17 @@ if env["SCONS_STAGE"] == "flags" : env["SWIFTEN_VERSION_PATCH"] = 0 env["SWIFTEN_LIBRARY_ALIASES"] = [] if env["PLATFORM"] == "win32" : - env["SWIFTEN_LIBRARY"] = "Swiften$SWIFTEN_VERSION_MAJOR" - env["SWIFTEN_LIBRARY_NAME"] = "Swiften$SWIFTEN_VERSION_MAJOR" - if env["PLATFORM"] == "darwin" : - env["SWIFTEN_LIBRARY"] = "Swiften$SWIFTEN_VERSION_MAJOR" - env["SWIFTEN_LIBRARY_NAME"] = "Swiften$SWIFTEN_VERSION_MAJOR" + env["SWIFTEN_LIBRARY"] = env.subst("Swiften$SWIFTEN_VERSION_MAJOR") + env["SWIFTEN_LIBRARY_NAME"] = env.subst("Swiften$SWIFTEN_VERSION_MAJOR") + elif env["PLATFORM"] == "darwin" : + env["SWIFTEN_LIBRARY"] = env.subst("Swiften$SWIFTEN_VERSION_MAJOR") + env["SWIFTEN_LIBRARY_NAME"] = env.subst("Swiften$SWIFTEN_VERSION_MAJOR") else : env["SWIFTEN_LIBRARY"] = "Swiften" env["SWIFTEN_LIBRARY_NAME"] = "Swiften" if ARGUMENTS.get("swiften_dll", False) : - env["SWIFTEN_LIBRARY_NAME"] = "libSwiften.so.$SWIFTEN_VERSION_MAJOR" - env["SWIFTEN_LIBRARY_ALIASES"] = ["libSwiften.so", "libSwiften.so.${SWIFTEN_VERSION_MAJOR}.${SWIFTEN_VERSION_MINOR}"] + env["SWIFTEN_LIBRARY_NAME"] = env.subst("libSwiften.so.$SWIFTEN_VERSION_MAJOR") + env["SWIFTEN_LIBRARY_ALIASES"] = ["libSwiften.so", env.subst("libSwiften.so.${SWIFTEN_VERSION_MAJOR}.${SWIFTEN_VERSION_MINOR}")] swiften_env = env.Clone() swiften_env["LIBPATH"] = [Dir(".")] |