[rkward-cvs] SF.net SVN: rkward-code:[4661] trunk/rkward/rkward

[m-eik at users.sf.net]

Revision: 4661
          http://sourceforge.net/p/rkward/code/4661
Author:   m-eik
Date:     2013-04-04 15:19:29 +0000 (Thu, 04 Apr 2013)
Log Message:
-----------
trying to compensate for missing /usr/bin/make on OS X, and correcting for a hard-coded path which is not present on standard MacPorts installations

Modified Paths:
--------------
    trunk/rkward/rkward/CMakeLists.txt
    trunk/rkward/rkward/rkward.sh.in

Modified: trunk/rkward/rkward/CMakeLists.txt
===================================================================
--- trunk/rkward/rkward/CMakeLists.txt	2013-04-04 07:12:31 UTC (rev 4660)
+++ trunk/rkward/rkward/CMakeLists.txt	2013-04-04 15:19:29 UTC (rev 4661)
@@ -9,7 +9,8 @@
 	SET(CPACK_BUNDLE_ICON rkward.icns)
 	SET(CPACK_BUNDLE_NAME RKWard)
 	SET(CPACK_BUNDLE_STARTUP_COMMAND rkward)
-	SET(KDE_START_DBUS "launchctl load -w /opt/rkward/Library/LaunchAgents/org.freedesktop.dbus-session.plist")
+	SET(LOOKUP_LOCAL_MAKE "if ! [[ -f /usr/bin/make ]] ; then export MAKE=${BIN_INSTALL_DIR}/gmake ; fi")
+	SET(KDE_START_DBUS "launchctl load -w ${CMAKE_INSTALL_PREFIX}/Library/LaunchAgents/org.freedesktop.dbus-session.plist")
 #	SET(CPACK_BUNDLE_PLIST ${CMAKE_SOURCE_DIR}/rkward/Info.plist)
 ELSE(Q_WS_MAC)
 	SET(RKWARD_FRONTEND_LOCATION ${LIBEXEC_INSTALL_DIR})

Modified: trunk/rkward/rkward/rkward.sh.in
===================================================================
--- trunk/rkward/rkward/rkward.sh.in	2013-04-04 07:12:31 UTC (rev 4660)
+++ trunk/rkward/rkward/rkward.sh.in	2013-04-04 15:19:29 UTC (rev 4661)
@@ -42,6 +42,7 @@
 ## set LC_NUMERIC to "C"
 export LC_NUMERIC="C"
 
+ at LOOKUP_LOCAL_MAKE@
 @KDE_START_DBUS@
 
 ## Start rkward. Running through R CMD to set all the relevant R enviroment variables