Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2011-03-16 19:46:28 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2011-03-16 19:46:28 (GMT) |
| commit | 1b621a72d4b5f938746a61f5cab3f34e1d3470a2 (patch) | |
| tree | 9aa3dff535b7b85a5b76b7d5a989c33f107cb102 /BuildTools | |
| parent | 0199071e626b5d06d4291d28a05761b495b0fc4c (diff) | |
| download | swift-1b621a72d4b5f938746a61f5cab3f34e1d3470a2.zip swift-1b621a72d4b5f938746a61f5cab3f34e1d3470a2.tar.bz2 | |
Install Swiften in the right dir.
Diffstat (limited to 'BuildTools')
| -rw-r--r-- | BuildTools/SCons/SConstruct | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/BuildTools/SCons/SConstruct b/BuildTools/SCons/SConstruct index c2c34d0..6f1b6eb 100644 --- a/BuildTools/SCons/SConstruct +++ b/BuildTools/SCons/SConstruct @@ -207,11 +207,12 @@ env["TEST_IGNORE_RESULT"] = "ignore_test_result" in ARGUMENTS # Packaging env["DIST"] = "dist" in ARGUMENTS or env.GetOption("clean") -if ARGUMENTS.get("SWIFT_INSTALLDIR", "") : - env["SWIFT_INSTALLDIR"] = Dir(ARGUMENTS["SWIFT_INSTALLDIR"]).abspath -if ARGUMENTS.get("SWIFTEN_INSTALLDIR", "") : - env["SWIFTEN_INSTALLDIR"] = Dir(ARGUMENTS["SWIFTEN_INSTALLDIR"]).abspath - +for path in ["SWIFT_INSTALLDIR", "SWIFTEN_INSTALLDIR"] : + if ARGUMENTS.get(path, "") : + if os.path.isabs(path) : + env[path] = Dir(ARGUMENTS[path]).abspath + else : + env[path] = Dir("#/" + ARGUMENTS[path]).abspath ################################################################################ # XCode / iPhone / ... |