diff -ru stellarium-0.11.0.orig/CMakeLists.txt stellarium-0.11.0/CMakeLists.txt
--- stellarium-0.11.0.orig/CMakeLists.txt	2011-07-02 09:22:18.000000000 -0400
+++ stellarium-0.11.0/CMakeLists.txt	2011-09-01 19:29:39.000000000 -0400
@@ -232,9 +232,10 @@
 
 ########### Set some global variables ###########
 IF(UNIX AND NOT WIN32)
-IF(APPLE)
-  SET(CMAKE_INSTALL_PREFIX "${PROJECT_BINARY_DIR}/Stellarium.app/Contents")
-ELSE(APPLE)
+IF(APPLE_APP)
+  SET(INSTALL_DATADIR "${CMAKE_INSTALL_PREFIX}/Resources")
+  SET(INSTALL_LOCALEDIR "${CMAKE_INSTALL_PREFIX}/Resources/locale")
+ELSE(APPLE_APP)
   ADD_DEFINITIONS(-DINSTALL_DATADIR="${CMAKE_INSTALL_PREFIX}/share/stellarium")
   ADD_DEFINITIONS(-DINSTALL_LOCALEDIR="${CMAKE_INSTALL_PREFIX}/share/locale")
 ENDIF()
@@ -306,7 +307,7 @@
 ENDIF()
 
 ########### Macosx Bundling ###############
-IF(APPLE)
+IF(APPLE_APP)
 ADD_CUSTOM_TARGET(macosx_bundle bash util/macosx_bundle.sh ${CMAKE_INSTALL_PREFIX} ${PROJECT_SOURCE_DIR} DEPENDS install WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} COMMENT "making the macosx bundle." VERBATIM)
 ENDIF()
 
diff -ru stellarium-0.11.0.orig/plugins/Satellites/src/gsatellite/sgp4ext.cpp stellarium-0.11.0/plugins/Satellites/src/gsatellite/sgp4ext.cpp
--- stellarium-0.11.0.orig/plugins/Satellites/src/gsatellite/sgp4ext.cpp	2011-07-02 09:22:18.000000000 -0400
+++ stellarium-0.11.0/plugins/Satellites/src/gsatellite/sgp4ext.cpp	2011-09-01 19:31:28.000000000 -0400
@@ -207,13 +207,13 @@
 *
 * --------------------------------------------------------------------------- */
 
-double  asinh
+/*double  asinh
         (
           double xval
         )
    {
      return log( xval + sqrt( xval*xval + 1.0 ) );
-   }  // end asinh
+   }  */ // end asinh
 
 
 /* -----------------------------------------------------------------------------
diff -ru stellarium-0.11.0.orig/plugins/Satellites/src/gsatellite/sgp4ext.h stellarium-0.11.0/plugins/Satellites/src/gsatellite/sgp4ext.h
--- stellarium-0.11.0.orig/plugins/Satellites/src/gsatellite/sgp4ext.h	2011-07-02 09:22:18.000000000 -0400
+++ stellarium-0.11.0/plugins/Satellites/src/gsatellite/sgp4ext.h	2011-09-01 19:31:59.000000000 -0400
@@ -62,10 +62,10 @@
           double& e0, double& m
         );
 
-double  asinh
+/*double  asinh
         (
           double xval
-        );
+        );*/
 
 void    rv2coe
         (
diff -ru stellarium-0.11.0.orig/src/core/StelFileMgr.cpp stellarium-0.11.0/src/core/StelFileMgr.cpp
--- stellarium-0.11.0.orig/src/core/StelFileMgr.cpp	2011-07-02 09:22:18.000000000 -0400
+++ stellarium-0.11.0/src/core/StelFileMgr.cpp	2011-09-01 19:29:39.000000000 -0400
@@ -51,7 +51,7 @@
 	{
 		userDir = winApiPath + "\\Stellarium";
 	}
-#elif defined(Q_OS_MAC)
+#elif defined(MACOSX_APP)
 	userDir = QDir::homePath() + "/Library/Application Support/Stellarium";
 #else
 	userDir = QDir::homePath() + "/.stellarium";
@@ -84,13 +84,13 @@
 		qWarning() << "WARNING: could not locate installation directory";
 	}
 
-#if defined(Q_OS_WIN) || defined(Q_OS_MAC)
+#if defined(Q_OS_WIN) || defined(MACOSX_APP)
 	screenshotDir = getDesktopDir();
 #else
 	screenshotDir = QDir::homePath();
 #endif
 
-#ifdef Q_OS_MAC
+#ifdef MACOSX_APP
 	QCoreApplication::addLibraryPath(QCoreApplication::applicationDirPath());
 #endif
 }
@@ -400,7 +400,7 @@
 		return ".";
 	}
 
-#ifdef Q_OS_MAC
+#ifdef MACOSX_APP
 	QString relativePath = "/../Resources";
 	if (QCoreApplication::applicationDirPath().contains("src")) {
 		relativePath = "/../../../../..";
@@ -457,7 +457,7 @@
 {
 #ifdef ENABLE_NLS
 	QFileInfo localePath;
-#if defined(Q_OS_WIN) || defined(Q_OS_MAC)
+#if defined(Q_OS_WIN) || defined(MACOSX_APP)
 	// Windows and MacOS X have the locale dir in the installation folder
 	localePath = QFileInfo(getInstallationDir() + "/locale");
 	// or MacosxDirs::getApplicationResourcesDirectory().append( "/locale" );
diff -ru stellarium-0.11.0.orig/src/core/StelUtils.cpp stellarium-0.11.0/src/core/StelUtils.cpp
--- stellarium-0.11.0.orig/src/core/StelUtils.cpp	2011-07-02 09:22:18.000000000 -0400
+++ stellarium-0.11.0/src/core/StelUtils.cpp	2011-09-01 19:32:15.000000000 -0400
@@ -413,10 +413,10 @@
 }
 
 // Return the inverse sinus hyperbolic of z
-double asinh(double z)
+/*double asinh(double z)
 {
 	return std::log(z+std::sqrt(z*z+1));
-}
+}*/
 
 /*************************************************************************
  Convert a QT QDateTime class to julian day
diff -ru stellarium-0.11.0.orig/src/core/StelUtils.hpp stellarium-0.11.0/src/core/StelUtils.hpp
--- stellarium-0.11.0.orig/src/core/StelUtils.hpp	2011-07-02 09:22:18.000000000 -0400
+++ stellarium-0.11.0/src/core/StelUtils.hpp	2011-09-01 19:32:36.000000000 -0400
@@ -177,7 +177,7 @@
 	int getBiggerPowerOfTwo(int value);
 
 	//! Return the inverse sinus hyperbolic of z.
-	double asinh(double z);
+	/*double asinh(double z);*/
 
 	///////////////////////////////////////////////////
 	// New Qt based General Calendar Functions.
diff -ru stellarium-0.11.0.orig/src/core/external/glues_stel/source/glues.h stellarium-0.11.0/src/core/external/glues_stel/source/glues.h
--- stellarium-0.11.0.orig/src/core/external/glues_stel/source/glues.h	2011-07-02 09:22:18.000000000 -0400
+++ stellarium-0.11.0/src/core/external/glues_stel/source/glues.h	2011-09-01 19:29:39.000000000 -0400
@@ -39,7 +39,7 @@
 
 #ifdef USE_OPENGL_ES2
 # include <GLES2/gl2.h>
-#elif defined(Q_OS_MAC) || defined(__APPLE__) || defined(__APPLE_CC__)
+#elif defined(MACOSX_APP)
 # include <OpenGL/gl.h>
 #elif defined(QT_OPENGL_ES_1) || defined(QT_OPENGL_ES_1_CL)
 # include <GLES/gl.h>
diff -ru stellarium-0.11.0.orig/src/core/external/glues_stel/source/glues_error.c stellarium-0.11.0/src/core/external/glues_stel/source/glues_error.c
--- stellarium-0.11.0.orig/src/core/external/glues_stel/source/glues_error.c	2011-07-02 09:22:18.000000000 -0400
+++ stellarium-0.11.0/src/core/external/glues_stel/source/glues_error.c	2011-09-01 19:29:39.000000000 -0400
@@ -33,7 +33,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#if defined(Q_OS_MAC) || defined(__APPLE__) || defined(__APPLE_CC__)
+#if defined(MACOSX_APP)
 # include <OpenGL/gl.h>
 #elif defined(QT_OPENGL_ES_1) || defined(QT_OPENGL_ES_1_CL)
 # include <GLES/gl.h>
diff -ru stellarium-0.11.0.orig/util/macosx_bundle.sh stellarium-0.11.0/util/macosx_bundle.sh
--- stellarium-0.11.0.orig/util/macosx_bundle.sh	2011-07-02 09:22:18.000000000 -0400
+++ stellarium-0.11.0/util/macosx_bundle.sh	2011-09-01 19:29:39.000000000 -0400
@@ -17,20 +17,6 @@
 rmdir ${CMAKE_INSTALL_PREFIX}/Resources/stellarium
 
 
-mkdir ${CMAKE_INSTALL_PREFIX}/Frameworks
-/usr/bin/perl util/pkgApp.pl ${CMAKE_INSTALL_PREFIX} MacOS/stellarium Frameworks 
-cp -pr /Developer/Applications/Qt/plugins/{imageformats,iconengines} ${CMAKE_INSTALL_PREFIX}/MacOS
-for f in ${CMAKE_INSTALL_PREFIX}/MacOS/{imageformats,iconengines}/*.dylib; do
-    fdir=`dirname $f`
-    dir=`basename $fdir`
-    base=`basename $f`
-    #/usr/bin/install_name_tool -id "@executable_path/$dir/$base" $f
-    for qt in `otool -L $f | egrep '	Qt' | cut -f 1 -d ' '`; do
-	newt="@executable_path/../Frameworks/$qt"
-	/usr/bin/install_name_tool -change $qt $newt $f
-    done
-done
-
 cp -pr $PROJECT_SOURCE_DIR/data/Icon.icns $CMAKE_INSTALL_PREFIX/Resources
 cp -pr $PROJECT_SOURCE_DIR/data/{PkgInfo,Info.plist} $CMAKE_INSTALL_PREFIX
 cp -pr $PROJECT_SOURCE_DIR/util/qt.conf $CMAKE_INSTALL_PREFIX/Resources
