From e9aa4203b5bd4c5c27e97aeff45c9442b84bf2f9 Mon Sep 17 00:00:00 2001
From: Jordan Sherer <jordan.sherer@zapier.com>
Date: Mon, 10 Sep 2018 13:18:34 -0400
Subject: [PATCH] Updated build for OSX

---
 CMakeCPackOptions.cmake.in                          |   9 +++++----
 CMakeLists.txt                                      |   1 +
 ...{Mac-wsjtx-startup.sh => Mac-ft8call-startup.sh} |   4 ++--
 Darwin/ReadMe.txt                                   |   4 ++++
 Darwin/{wsjtx_DMG.DS_Store => ft8call_DMG.DS_Store} | Bin
 5 files changed, 12 insertions(+), 6 deletions(-)
 rename Darwin/{Mac-wsjtx-startup.sh => Mac-ft8call-startup.sh} (83%)
 rename Darwin/{wsjtx_DMG.DS_Store => ft8call_DMG.DS_Store} (100%)

diff --git a/CMakeCPackOptions.cmake.in b/CMakeCPackOptions.cmake.in
index 2e1cd0f..bbe5be0 100644
--- a/CMakeCPackOptions.cmake.in
+++ b/CMakeCPackOptions.cmake.in
@@ -67,11 +67,12 @@ endif ()
 if ("${CPACK_GENERATOR}" STREQUAL "DragNDrop")
   set (CPACK_DMG_VOLUME_NAME "@PROJECT_NAME@")
   set (CPACK_DMG_BACKGROUND_IMAGE "@PROJECT_SOURCE_DIR@/icons/Darwin/DragNDrop Background.png")
-  set (CPACK_DMG_DS_STORE "@PROJECT_SOURCE_DIR@/Darwin/wsjtx_DMG.DS_Store")
+  set (CPACK_DMG_DS_STORE "@PROJECT_SOURCE_DIR@/Darwin/ft8call_DMG.DS_Store")
   set (CPACK_BUNDLE_NAME "@WSJTX_BUNDLE_NAME@")
-  set (CPACK_PACKAGE_ICON "@PROJECT_BINARY_DIR@/wsjtx.icns")
-  set (CPACK_BUNDLE_ICON "@PROJECT_BINARY_DIR@/wsjtx.icns")
-  set (CPACK_BUNDLE_STARTUP_COMMAND "@PROJECT_SOURCE_DIR@/Mac-wsjtx-startup.sh")
+  set (CPACK_PACKAGE_ICON "@PROJECT_BINARY_DIR@/ft8call.icns")
+  set (CPACK_BUNDLE_ICON "@PROJECT_BINARY_DIR@/ft8call.icns")
+  set (CPACK_BUNDLE_STARTUP_COMMAND "@PROJECT_SOURCE_DIR@/Mac-ft8call-startup.sh")
+  set (CPACK_PACKAGING_INSTALL_PREFIX "/")
 endif ()
 
 if ("${CPACK_GENERATOR}" STREQUAL "WIX")
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f2fc7b9..ab1ab58 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -823,6 +823,7 @@ endif (WIN32)
 #
 if (APPLE)
   set (WSJTX_BUNDLE_VERSION ${wsjtx_VERSION})
+  set (CMAKE_INSTALL_PREFIX "/")
 
   # make sure CMAKE_INSTALL_PREFIX ends in /
   string (LENGTH "${CMAKE_INSTALL_PREFIX}" LEN)
diff --git a/Darwin/Mac-wsjtx-startup.sh b/Darwin/Mac-ft8call-startup.sh
similarity index 83%
rename from Darwin/Mac-wsjtx-startup.sh
rename to Darwin/Mac-ft8call-startup.sh
index b393910..d1a3f78 100644
--- a/Darwin/Mac-wsjtx-startup.sh
+++ b/Darwin/Mac-ft8call-startup.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 WSJTX_BUNDLE="`echo "$0" | sed -e 's/\/Contents\/MacOS\/.*//'`"
 WSJTX_RESOURCES="$WSJTX_BUNDLE/Contents/Resources"
-WSJTX_TEMP="/tmp/wsjtx/$UID"
+WSJTX_TEMP="/tmp/ft8call/$UID"
 
 echo "running $0"
 echo "WSJTX_BUNDLE: $WSJTX_BUNDLE"
@@ -13,4 +13,4 @@ export "DYLD_LIBRARY_PATH=$WSJTX_RESOURCES/lib"
 export "PATH=$WSJTX_RESOURCES/bin:$PATH"
 
 #export
-exec "$WSJTX_RESOURCES/bin/wsjtx"
\ No newline at end of file
+exec "$WSJTX_RESOURCES/bin/ft8call"
diff --git a/Darwin/ReadMe.txt b/Darwin/ReadMe.txt
index bb8f02a..ed55951 100644
--- a/Darwin/ReadMe.txt
+++ b/Darwin/ReadMe.txt
@@ -1,3 +1,7 @@
+
+                    Notes on FT8Call Installation for Mac OS X
+                  (replace all instances of WSJT-X with FT8Call)
+
                     Notes on WSJT-X Installation for Mac OS X
                     -----------------------------------------
 
diff --git a/Darwin/wsjtx_DMG.DS_Store b/Darwin/ft8call_DMG.DS_Store
similarity index 100%
rename from Darwin/wsjtx_DMG.DS_Store
rename to Darwin/ft8call_DMG.DS_Store