[rkward-cvs] SF.net SVN: rkward-code:[4662] trunk/rkward/rkward/CMakeLists.txt

m-eik at users.sf.net m-eik at users.sf.net
Thu Apr 4 15:31:07 UTC 2013


Revision: 4662
          http://sourceforge.net/p/rkward/code/4662
Author:   m-eik
Date:     2013-04-04 15:31:07 +0000 (Thu, 04 Apr 2013)
Log Message:
-----------
ok, works; little refinement to not produce additional problems in case gmake is not present either

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

Modified: trunk/rkward/rkward/CMakeLists.txt
===================================================================
--- trunk/rkward/rkward/CMakeLists.txt	2013-04-04 15:19:29 UTC (rev 4661)
+++ trunk/rkward/rkward/CMakeLists.txt	2013-04-04 15:31:07 UTC (rev 4662)
@@ -9,7 +9,7 @@
 	SET(CPACK_BUNDLE_ICON rkward.icns)
 	SET(CPACK_BUNDLE_NAME RKWard)
 	SET(CPACK_BUNDLE_STARTUP_COMMAND rkward)
-	SET(LOOKUP_LOCAL_MAKE "if ! [[ -f /usr/bin/make ]] ; then export MAKE=${BIN_INSTALL_DIR}/gmake ; fi")
+	SET(LOOKUP_LOCAL_MAKE "if ! [ -f /usr/bin/make ] && [ -f ${BIN_INSTALL_DIR}/gmake ] ; 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)





More information about the rkward-tracker mailing list