From 2948ac74328555d0749a0eecd98bea9c2574eba3 Mon Sep 17 00:00:00 2001
From: pepperpepperpepper <pepper@scannerjammer.com>
Date: Mon, 7 Dec 2015 19:22:55 -0800
Subject: fixed paths problem when using as a submodule

---
 photoblaster/.ropeproject/globalnames | Bin 1808 -> 1824 bytes
 photoblaster/config.py                |  23 +++++++++++++++++++----
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/photoblaster/.ropeproject/globalnames b/photoblaster/.ropeproject/globalnames
index cc1ff5d..fd96358 100644
Binary files a/photoblaster/.ropeproject/globalnames and b/photoblaster/.ropeproject/globalnames differ
diff --git a/photoblaster/config.py b/photoblaster/config.py
index b4ad22e..409583d 100644
--- a/photoblaster/config.py
+++ b/photoblaster/config.py
@@ -10,12 +10,27 @@ MAX_SIZE = 1024 * 1024 * 1.2 * 1.5
 BIN_CONVERT = "/usr/bin/convert"
 BIN_COMPOSITE = "/usr/bin/composite"
 BIN_IDENTIFY = "/usr/bin/identify"
-THREEDROTATE = "./bin/3Drotate"
-GRID = "./bin/grid"
-BEVELBORDER = "./bin/bevelborder"
+
+_RELATIVE_DIR = os.path.dirname(__file__)
+
+
+# FIXME see how django does it
+def _bin_dir(filename):
+    return os.path.abspath(
+        os.path.join(
+            _RELATIVE_DIR,
+            "..",
+            "bin",
+            filename
+        )
+    )
+
+THREEDROTATE = _bin_dir("3Drotate")
+GRID = _bin_dir("grid")
+BEVELBORDER = _bin_dir("bevelborder")
 
 # common parameters
-DEFAULT_FINALFORMAT = "png";
+DEFAULT_FINALFORMAT = "png"
 DEFAULT_HEIGHT = 400
 DEFAULT_WIDTH = 600
 
-- 
cgit v1.2.3-70-g09d2