Mercurial > emacs
changeset 49090:fc1853b3e3dd
* 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
| author | Steven Tamm <steventamm@mac.com> |
|---|---|
| date | Tue, 07 Jan 2003 05:46:31 +0000 |
| parents | 6f9b527df5c6 |
| children | 4d9ad5d4f2d4 |
| files | ChangeLog Makefile.in configure.in |
| diffstat | 3 files changed, 30 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Tue Jan 07 01:26:24 2003 +0000 +++ b/ChangeLog Tue Jan 07 05:46:31 2003 +0000 @@ -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.
--- a/Makefile.in Tue Jan 07 01:26:24 2003 +0000 +++ b/Makefile.in Tue Jan 07 05:46:31 2003 +0000 @@ -141,6 +141,9 @@ # 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_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;
--- a/configure.in Tue Jan 07 01:26:24 2003 +0000 +++ b/configure.in Tue Jan 07 05:46:31 2003 +0000 @@ -114,6 +114,10 @@ [ --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 @@ 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(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.])