From 8743edad9e004e611f7ae30f5766ebd170bee4b1 Mon Sep 17 00:00:00 2001
From: Li Linfeng <lilinfeng303@outlook.com>
Date: Sat, 3 Aug 2019 15:01:47 +0800
Subject: [PATCH] Use relative path on tools

---
 CMakeLists.txt                      | 1 +
 src/celestia/qt/CMakeLists.txt      | 4 +---
 src/tools/spice2xyzv/spice2xyzv.cpp | 4 ++++
 src/tools/stardb/buildstardb.cpp    | 2 +-
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6416223d..ee2af518 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -193,6 +193,7 @@ endif()
 if(NATIVE_OSX_APP)
   set(CMAKE_INSTALL_PREFIX "${PROJECT_BINARY_DIR}/${PROJECT_NAME}.app/Contents")
   set(CMAKE_INSTALL_FULL_LOCALEDIR "${CMAKE_INSTALL_PREFIX}/Resources/locale")
+  set(CMAKE_INSTALL_BINDIR "MacOS")
   set(DATADIR "${CMAKE_INSTALL_PREFIX}/Resources")
   set(FULL_DATADIR "${CMAKE_INSTALL_PREFIX}/Resources")
 else()
diff --git a/src/celestia/qt/CMakeLists.txt b/src/celestia/qt/CMakeLists.txt
index f93bee78..3a55f077 100644
--- a/src/celestia/qt/CMakeLists.txt
+++ b/src/celestia/qt/CMakeLists.txt
@@ -73,9 +73,7 @@ if(APPLE)
   set_property(TARGET celestia-qt APPEND_STRING PROPERTY LINK_FLAGS " -framework CoreFoundation")
   set_property(TARGET celestia-qt APPEND_STRING PROPERTY LINK_FLAGS " -framework CoreServices")
 endif()
+install(TARGETS celestia-qt RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 if(NATIVE_OSX_APP)
-  install(TARGETS celestia-qt RUNTIME DESTINATION MacOS)
   install(FILES ../macosx/celestia.icns DESTINATION Resources)
-else()
-  install(TARGETS celestia-qt RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 endif()
diff --git a/src/tools/spice2xyzv/spice2xyzv.cpp b/src/tools/spice2xyzv/spice2xyzv.cpp
index 603ac04a..7dd610e2 100644
--- a/src/tools/spice2xyzv/spice2xyzv.cpp
+++ b/src/tools/spice2xyzv/spice2xyzv.cpp
@@ -588,7 +588,11 @@ int main(int argc, char* argv[])
     }
 
     // Load the leap second kernel
+#if defined(_WIN32) || defined(NATIVE_OSX_APP)
+    furnsh_c("naif0012.tls");
+#else
     furnsh_c(CONFIG_DATA_DIR "/" "naif0012.tls");
+#endif
 
     writeCommentHeader(config, cout);
     convertSpkToXyzv(config, cout);
diff --git a/src/tools/stardb/buildstardb.cpp b/src/tools/stardb/buildstardb.cpp
index 775b96cf..c980f45c 100644
--- a/src/tools/stardb/buildstardb.cpp
+++ b/src/tools/stardb/buildstardb.cpp
@@ -22,7 +22,7 @@
 using namespace std;
 using namespace celmath;
 
-#ifdef _WIN32
+#if defined(_WIN32) || defined(NATIVE_OSX_APP)
 static string MainDatabaseFile("hip_main.dat");
 static string TychoDatabaseFile("tyc_main.dat");
 static string ComponentDatabaseFile("h_dm_com.dat");