From dcd86c07e1ecccec63d9076a1ad2f9caf09067c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Remko=20Tron=C3=A7on?= <git@el-tramo.be> Date: Sat, 30 Apr 2011 10:06:20 +0200 Subject: Substitute SCons variables correctly. 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(".")] -- cgit v0.10.2-6-g49f6