* configure.in: New option, --enable-carbon-app, to specify

	that the application should be installed
	* Makefile.in (install-arch-dep): On Mac OS X, install the
	Emacs.app application if carbon-app is enabled

diff --git a/ChangeLog b/ChangeLog
index afc550f8981aec50c66e065bec6510c0a5053ba8..2b90d93b99845dfc8c57fc70c0c9355cad306849 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2003-01-07  Steven Tamm  <steventamm@mac.com>
+
+       * configure.in: New option, --enable-carbon-app, to specify
+       that the application should be installed
+       * Makefile.in (install-arch-dep): On Mac OS X, install the
+       Emacs.app application if carbon-app is enabled
+
 2003-01-06  Dave Love  <fx@gnu.org>
 
        * configure.in: Check for nl_langinfo.

diff --git a/Makefile.in b/Makefile.in
index 99671ad8a7eeff4ddd82e851a9ff569f98292008..85f2425c81f7a2a3fb1aefa132b06aa0593e22a9 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -141,6 +141,9 @@ VPATH=@srcdir@
 # Where to find the application default.
 x_default_search_path=@x_default_search_path@
 
+# Location to install Emacs.app on Mac OS X
+carbon_appdir=@carbon_appdir@
+
 # ==================== Emacs-specific directories ====================
 
 # These variables hold the values Emacs will actually use.  They are
@@ -365,6 +368,12 @@ install-arch-dep: mkdir
            ${INSTALL_DATA} lib-src/$$f ${archlibdir}/$$f; \
          else true; fi ; \
        done
+       if test "${carbon_appdir}" != ""; then \
+         umask 022; mkdir -p ${carbon_appdir}/Emacs.app; \
+         (cd mac/Emacs.app; tar -chf - . ) | \
+               (cd ${carbon_appdir}/Emacs.app; umask 022; tar -xvf - \
+                       && cat > /dev/null) || exit 1; \
+       fi
 
 ### Install the files that are machine-independent.
 ### Most of them come straight from the distribution;

diff --git a/configure.in b/configure.in
index e77e1299c52304336d34fd999cd94b0b930f125c..24f2b5908ad3328733da53a6c90b2bd0a5a34506 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -114,6 +114,10 @@ AC_ARG_WITH(xim,
 [  --without-xim           don't use X11 XIM])
 AC_ARG_WITH(carbon,
 [  --without-carbon        don't use Carbon GUI on Mac OS X])
+AC_ARG_ENABLE(carbon-app,
+[[  --enable-carbon-app[=DIR]  [DIR=/Application]
+                          specify install directory for Emacs.app on Mac OS X]],
+[ carbon_appdir_x=${enableval}])
 
 #### Make srcdir absolute, if it isn't already.  It's important to
 #### avoid running the path through pwd unnecessarily, since pwd can
@@ -2030,6 +2034,15 @@ fi
 
 if test "${HAVE_CARBON}" = "yes"; then
   AC_DEFINE(HAVE_CARBON, 1, [Define to 1 if you are using the Carbon API on Mac OS X.])
+  window_system=mac
+  ## Specify the install directory
+  carbon_appdir=
+  if test "${carbon_appdir_x}" != ""; then
+    case ${carbon_appdir_x} in
+      y | ye | yes)  carbon_appdir=/Applications ;;
+      * ) carbon_appdir=${carbon_appdir_x} ;;
+    esac
+  fi
 fi
 
 ### Use session management (-lSM -lICE) if available
@@ -2395,6 +2408,7 @@ AC_SUBST(X_TOOLKIT_TYPE)
 AC_SUBST(machfile)
 AC_SUBST(opsysfile)
 AC_SUBST(GETLOADAVG_LIBS)
+AC_SUBST(carbon_appdir)
 
 AC_DEFINE_UNQUOTED(EMACS_CONFIGURATION,  "${canonical}",
                   [Define to the canonical Emacs configuration name.])