mac-self-contained.patch

diff --git a/configure b/configure
index 0e2d827..daf7388 100755
--- a/configure
+++ b/configure
@@ -24892,6 +24892,20 @@ ac_config_commands="$ac_config_commands epaths"
 ac_config_commands="$ac_config_commands gdbinit"
 
 
+if test "${with_mac}" != no; then
+  prefix="\${mac_appdir}/Emacs.app/Contents/Resources"
+  exec_prefix="\${mac_appdir}/Emacs.app/Contents/MacOS"
+    libexecdir="\${mac_appdir}/Emacs.app/Contents/MacOS/libexec"
+  archlibdir="\${mac_appdir}/Emacs.app/Contents/MacOS/libexec"
+  docdir="\${mac_appdir}/Emacs.app/Contents/Resources/etc"
+  etcdir="\${mac_appdir}/Emacs.app/Contents/Resources/etc"
+      infodir="\${mac_appdir}/Emacs.app/Contents/Resources/info"
+  mandir="\${mac_appdir}/Emacs.app/Contents/Resources/man"
+  lispdir="\${mac_appdir}/Emacs.app/Contents/Resources/lisp"
+  leimdir="\${mac_appdir}/Emacs.app/Contents/Resources/leim"
+  INSTALL_ARCH_INDEP_EXTRA=
+fi
+
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
 # tests run on this system so they can be shared between configure
diff --git a/configure.ac b/configure.ac
index 62f53a3..9d82d2d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4657,4 +4657,21 @@ if test ! -f src/.gdbinit && test -f $srcdir/src/.gdbinit; then
 fi
 ])
 
+if test "${with_mac}" != no; then
+  prefix="\${mac_appdir}/Emacs.app/Contents/Resources"
+  exec_prefix="\${mac_appdir}/Emacs.app/Contents/MacOS"
+  dnl This one isn't really used, only archlibdir is.
+  libexecdir="\${mac_appdir}/Emacs.app/Contents/MacOS/libexec"
+  archlibdir="\${mac_appdir}/Emacs.app/Contents/MacOS/libexec"
+  docdir="\${mac_appdir}/Emacs.app/Contents/Resources/etc"
+  etcdir="\${mac_appdir}/Emacs.app/Contents/Resources/etc"
+  dnl FIXME maybe set datarootdir instead.
+  dnl That would also get applications, icons, man.
+  infodir="\${mac_appdir}/Emacs.app/Contents/Resources/info"
+  mandir="\${mac_appdir}/Emacs.app/Contents/Resources/man"
+  lispdir="\${mac_appdir}/Emacs.app/Contents/Resources/lisp"
+  leimdir="\${mac_appdir}/Emacs.app/Contents/Resources/leim"
+  INSTALL_ARCH_INDEP_EXTRA=
+fi
+
 AC_OUTPUT