Update node listing.

[bpt/emacs.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 4a725fe..4439e85 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -3,7 +3,7 @@
 # DIST: that first.
 
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-#   2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+#   2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
 #   Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
@@ -393,6 +393,8 @@ $(srcdir)/src/stamp-h.in: $(AUTOCONF_INPUTS)
 install: all install-arch-indep install-arch-dep install-leim blessmail
        @true
 
+MV_DIRS = for i in $$dir; do rm -fr $$(basename "$$i") ; mv "$$i" . ; done
+
 ### Install the executables that were compiled specifically for this machine.
 ### It would be nice to do something for a parallel make
 ### to ensure that install-arch-indep finishes before this starts.
@@ -414,10 +416,11 @@ install-arch-dep: mkdir
        done
        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 ; \
+           if test -d share/emacs ; then dir=share/emacs/*/*; $(MV_DIRS); fi;\
+           if test -d share/info ; then dir=share/info; $(MV_DIRS) ; fi ; \
            rm -fr share ) ; \
-         ( cd ${ns_appbindir}/libexec ; mv -f emacs/*/*/* . ; rm -fr emacs ) ; \
+         ( cd ${ns_appbindir}/libexec ; dir=emacs/*/*/* ; $(MV_DIRS); \
+           rm -fr emacs ) ; \
          ( cd ${ns_appbindir}/bin ; rm -f emacs emacs-23* ; \
            ln -sf ../libexec/* .) ; \
        else true ; fi
@@ -662,7 +665,7 @@ uninstall:
          done;)
        (cd $(DESTDIR)${man1dir}  && rm -f $(MAN_PAGES))
        (cd $(DESTDIR)${bindir}  && rm -f $(EMACSFULL) $(EMACS))
-       (cd $(DESTDIR)${icondir} && rm -f hicolor/*x*/apps/emacs* hicolor/scalable/*/emacs*)
+       (cd $(DESTDIR)${icondir} && rm -f hicolor/*x*/apps/emacs.png hicolor/*x*/apps/emacs22.png hicolor/scalable/apps/emacs.svg hicolor/scalable/mimetypes/emacs-document.svg )
        -rm -f $(DESTDIR)${desktopdir}/emacs.desktop
        for file in snake-scores tetris-scores; do \
          file=$(DESTDIR)${gamedir}/$${file}; \