From 1b621a72d4b5f938746a61f5cab3f34e1d3470a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Remko=20Tron=C3=A7on?= <git@el-tramo.be>
Date: Wed, 16 Mar 2011 20:46:28 +0100
Subject: Install Swiften in the right dir.


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 / ...
-- 
cgit v0.10.2-6-g49f6