* src/frontends/controllers/Dialog.{cpp,h}:

[lyx.git] / config / lyxinclude.m4

diff --git a/config/lyxinclude.m4 b/config/lyxinclude.m4
index 50cd0ce18595063221320795455003e22477ccc2..dd8220d6c7351f243da3dba5c561a8b851b8d928 100644 (file)
--- a/config/lyxinclude.m4
+++ b/config/lyxinclude.m4
@@ -15,7 +15,7 @@ case AC_PACKAGE_VERSION in
          AC_DEFINE(DEVEL_VERSION, 1, [Define if you are building a development version of LyX])
          LYX_DATE="not released yet"
          echo "WARNING: This is a development version. Expect bugs.";;
-  *pre*|*alpha*|*beta*) lyx_prerelease=yes
+  *pre*|*alpha*|*beta*|*rc*) lyx_prerelease=yes
         echo "WARNING: This is a prerelease. Be careful and backup your documents.";;
 esac
 AC_SUBST(lyx_devel_version)])
@@ -581,6 +581,7 @@ AC_ARG_WITH(packaging,
                   *) lyx_use_packaging=posix;;
   esac])
 AC_MSG_RESULT($lyx_use_packaging)
+lyx_install_macosx=false
 case $lyx_use_packaging in
    macosx) AC_DEFINE(USE_MACOSX_PACKAGING, 1, [Define to 1 if LyX should use a MacOS X application bundle file layout])
           PACKAGE=LyX${version_suffix}
@@ -589,7 +590,8 @@ case $lyx_use_packaging in
           libdir='${prefix}/Contents/Resources'
           datadir='${prefix}/Contents/Resources'
           pkgdatadir='${datadir}'
-          mandir='${datadir}/man' ;;
+          mandir='${datadir}/man' 
+          lyx_install_macosx=true ;;
   windows) AC_DEFINE(USE_WINDOWS_PACKAGING, 1, [Define to 1 if LyX should use a Windows-style file layout])
           PACKAGE=LyX${version_suffix}
           default_prefix="C:/Program Files/${PACKAGE}"
@@ -605,6 +607,7 @@ case $lyx_use_packaging in
           default_prefix=$ac_default_prefix ;;
     *) LYX_ERROR([Unknown packaging type $lyx_use_packaging]) ;;
 esac
+AM_CONDITIONAL(INSTALL_MACOSX, $lyx_install_macosx)
 AC_SUBST(pkgdatadir)
 AC_SUBST(program_suffix)
 ])