From a58083b65c2f7e90353196f7888729e0b9c72f96 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20Neum=C3=BCller?= <cn00@gmx.at>
Date: Tue, 25 Jun 2013 13:12:42 +0200
Subject: [PATCH] Chage default location of base.jd.

It is now installed to <prefix>/share/jade-engine instead of just
<prefix>/share.
This path is now also looked for in main().
---
 base.jd/CMakeLists.txt | 2 +-
 src/main.cpp           | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/base.jd/CMakeLists.txt b/base.jd/CMakeLists.txt
index fc5d2f1..e80b10f 100644
--- a/base.jd/CMakeLists.txt
+++ b/base.jd/CMakeLists.txt
@@ -25,4 +25,4 @@ add_custom_target(basejd ALL
     DEPENDS ${basejdout}
     SOURCES ${SRCS})
 
-install(FILES ${basejdout} DESTINATION share)
+install(FILES ${basejdout} DESTINATION "share/jade-engine")
diff --git a/src/main.cpp b/src/main.cpp
index 122cb3d..1cae66b 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -289,6 +289,7 @@ int main(int argc, char* argv[])
         std::vector<std::string> baselibpaths;
         baselibpaths.push_back(programpath + "/base.jd");
         baselibpaths.push_back(programpath + "/../base.jd");
+        baselibpaths.push_back(programpath + "/../share/jade-engine/base.jd");
         baselibpaths.push_back(programpath + "/../share/base.jd");
         baselibpaths.push_back(basepath + "/base.jd");
         baselibpaths.push_back("./base.jd");