Upgraded to MH-E version 7.1.

[bpt/emacs.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 7640d91..85f2425 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
@@ -202,7 +205,7 @@ gamedir=@gamedir@
 INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_INFO = install-info
+INSTALL_INFO = @INSTALL_INFO@
 # By default, we uphold the dignity of our programs.
 INSTALL_STRIP =
 
@@ -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;
@@ -715,8 +724,8 @@ dvi:
 .PHONY: maybe_bootstrap
 
 maybe_bootstrap:
-       @bar="`echo ./lisp/*.elc`"; \
-       if [ \( "$(bar)" = './lisp/*.elc' \) -o \( "$(bar)" = '' \) ]; then \
+       @bar="`echo $(srcdir)/lisp/*.elc`"; \
+       if [ \( "$$bar" = '$(srcdir)/lisp/*.elc' \) -o \( "$$bar" = '' \) ]; then \
          echo "Your tree does not include the compiled Lisp files."; \
          echo "You need to do \`make bootstrap' to build Emacs."; \
          echo "Emacs now requires Texinfo version 4.2."; \