Checking in the correct versions of the files, sorry, I hade used the files

[bpt/emacs.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index c5cd80b..7d7b0d7 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -137,9 +137,10 @@ man1dir=$(mandir)/man1
 infodir=@infodir@
 INFO_FILES=ada-mode autotype calc ccmode cl dbus dired-x ebrowse ediff \
            efaq eintr elisp emacs emacs-mime epa erc eshell eudc       \
-           flymake forms gnus idlwave info message mh-e newsticker ns-emacs \
-           nxml-mode org pcl-cvs pgg rcirc reftex remember sasl sc ses \
-           sieve speedbar tramp vip viper widget woman smtpmail url
+           flymake forms gnus idlwave info mairix-el message mh-e      \
+           newsticker nxml-mode org pcl-cvs pgg rcirc reftex remember  \
+           sasl sc ses sieve speedbar tramp vip viper widget woman     \
+           smtpmail url
 
 # Directory for local state files for all programs.
 localstatedir=@localstatedir@
@@ -164,9 +165,6 @@ 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@
-
 # Location to install Emacs.app under NeXT/Open/GNUstep / Cocoa
 ns_appdir=@ns_appdir@
 ns_appbindir=@ns_appbindir@
@@ -410,16 +408,10 @@ install-arch-dep: mkdir
            ${INSTALL_DATA} lib-src/$$f $(DESTDIR)${archlibdir}/$$f; \
          else true; fi ; \
        done
-       if test "${carbon_appdir}" != ""; then \
-         umask 022; mkdir -p $(DESTDIR)${carbon_appdir}/Emacs.app; \
-         (cd mac/Emacs.app; (tar -chf - . | \
-               (cd $(DESTDIR)${carbon_appdir}/Emacs.app; umask 022; tar -xvf - \
-                       && cat > /dev/null))) || exit 1; \
-       fi
        if test "${ns_appdir}" != ""; then \
          ( cd ${ns_appresdir} ; \
            if test -d share/emacs ; then mv -f share/emacs/*/* . ; fi ; \
-           if test -d info ; then mv -f share/info . ; fi ; \
+           if test -d share/info ; then mv -f share/info . ; fi ; \
            rm -fr share ) ; \
          ( cd ${ns_appbindir}/libexec ; mv -f emacs/*/*/* . ; rm -fr emacs ) ; \
          ( cd ${ns_appbindir}/bin ; rm -f emacs emacs-23* ; \