(dired-pop-to-buffer): Use fit-window-to-buffer when

[bpt/emacs.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 8e82639..055685c 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     \
-           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,8 +165,10 @@ 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@
+ns_appresdir=@ns_appresdir@
 
 # Where the etc/emacs.desktop file is to be installed.
 desktopdir=$(datarootdir)/applications
@@ -405,12 +408,15 @@ 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 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* ; \
+           ln -sf ../libexec/* .) ; \
+       else true ; fi
 
 ## http://lists.gnu.org/archive/html/emacs-devel/2007-10/msg01672.html
 ## Needs to be the user running install, so configure can't set it.
@@ -565,7 +571,7 @@ install-arch-indep: mkdir info install-etc
        -chmod -R a+r $(DESTDIR)${datadir}/emacs/${version} $(DESTDIR)${datadir}/emacs/site-lisp ${COPYDESTS} $(DESTDIR)${infodir}
        thisdir=`/bin/pwd`; \
        cd ${mansrcdir}; \
-       for page in emacs emacsclient etags ctags ; do \
+       for page in ebrowse emacs emacsclient etags ctags ; do \
          (cd $${thisdir}; \
           ${INSTALL_DATA} ${mansrcdir}/$${page}.1 $(DESTDIR)${man1dir}/$${page}${manext}; \
           chmod a+r $(DESTDIR)${man1dir}/$${page}${manext}); \