* lisp/window.el (with-temp-buffer-window): Doc tweak.

[bpt/emacs.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 571013e..78630ef 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -259,8 +259,9 @@ GZIP_INFO = @GZIP_INFO@
 TRANSFORM = @program_transform_name@
 
 # What emacs should be called when installed.
-EMACS = `echo emacs${EXEEXT} | sed '$(TRANSFORM)'`
-EMACSFULL = `echo emacs-${version}${EXEEXT} | sed '$(TRANSFORM)'`
+EMACS_NAME = `echo emacs | sed '$(TRANSFORM)'`
+EMACS = ${EMACS_NAME}${EXEEXT}
+EMACSFULL = `echo emacs-${version} | sed '$(TRANSFORM)'`${EXEEXT}
 
 # Subdirectories to make recursively.
 SUBDIR = lib lib-src src lisp leim
@@ -361,7 +362,7 @@ blessmail: Makefile src FRC
 # etc. to be built without running into similar recursion problems.
 MAKEFILE_NAME = Makefile
 $(MAKEFILE_NAME): config.status $(srcdir)/src/config.in \
-          $(srcdir)/Makefile.in $(SUBDIR_MAKEFILES_IN)
+          $(srcdir)/Makefile.in $(SUBDIR_MAKEFILES_IN) $(srcdir)/src/lisp.mk
        MAKE='$(MAKE)' ./config.status
 
 # Don't erase these files if make is interrupted while refreshing them.
@@ -622,27 +623,35 @@ install-man:
        thisdir=`/bin/pwd`; \
        cd ${mansrcdir}; \
        for page in *.1; do \
+         dest=`echo "$${page}" | sed -e 's/\.1$$//' -e '$(TRANSFORM)'`.1; \
          (cd $${thisdir}; \
-          ${INSTALL_DATA} ${mansrcdir}/$${page} $(DESTDIR)${man1dir}/$${page}); \
+          ${INSTALL_DATA} ${mansrcdir}/$${page} $(DESTDIR)${man1dir}/$${dest}); \
          ( [ -n "${GZIP_INFO}" ] && [ -n "${GZIP_PROG}" ] ) || continue ; \
-         rm -f $(DESTDIR)${man1dir}/$${page}.gz; \
-         ${GZIP_PROG} -9n $(DESTDIR)${man1dir}/$${page}; \
+         rm -f $(DESTDIR)${man1dir}/$${dest}.gz; \
+         ${GZIP_PROG} -9n $(DESTDIR)${man1dir}/$${dest}; \
        done
 
 ## Install those items from etc/ that need to end up elsewhere.
 install-etc:
        umask 022; ${MKDIR_P} $(DESTDIR)${desktopdir}
-       ${INSTALL_DATA} ${srcdir}/etc/emacs.desktop \
-         $(DESTDIR)${desktopdir}/emacs.desktop
+       tmp=etc/emacs.tmpdesktop; rm -f $${tmp}; \
+       emacs_name=`echo emacs | sed '$(TRANSFORM)'`; \
+       sed -e "/^Exec=emacs/ s/emacs/$${emacs_name}/" \
+         -e "/^Icon=emacs/ s/emacs/$${emacs_name}/" \
+         ${srcdir}/etc/emacs.desktop > $${tmp}; \
+       ${INSTALL_DATA} $${tmp} $(DESTDIR)${desktopdir}/${EMACS_NAME}.desktop; \
+       rm -f $${tmp}
        thisdir=`/bin/pwd`; \
        cd ${iconsrcdir} || exit 1; umask 022 ; \
        for dir in */*/apps */*/mimetypes; do \
          [ -d $${dir} ] || continue ; \
          ( cd $${thisdir}; ${MKDIR_P} $(DESTDIR)${icondir}/$${dir} ) ; \
-         for icon in $${dir}/*.*; do \
+         for icon in $${dir}/emacs[.-]*; do \
            [ -r $${icon} ] || continue ; \
+           ext=`echo "$${icon}" | sed -e 's|.*\.||'`; \
+           dest=`echo "$${icon}" | sed -e 's|.*/||' -e "s|\.$${ext}$$||" -e '$(TRANSFORM)'`.$${ext} ; \
            ( cd $${thisdir}; \
-             ${INSTALL_DATA} ${iconsrcdir}/$${icon} $(DESTDIR)${icondir}/$${icon} ) \
+             ${INSTALL_DATA} ${iconsrcdir}/$${icon} $(DESTDIR)${icondir}/$${dir}/$${dest} ) \
            || exit 1; \
          done ; \
        done
@@ -677,21 +686,28 @@ uninstall:
        -rm -rf $(DESTDIR)${libexecdir}/emacs/${version}
        thisdir=`/bin/pwd`; \
        (info_misc=`cd doc/misc; ${MAKE} echo-info | sed '/ing directory/d'`; \
-         cd $(DESTDIR)${infodir} && \
-         for elt in ${INFO_NONMISC} $${info_misc}; do \
-           (cd $${thisdir}; \
-            $(INSTALL_INFO) --remove --info-dir=$(DESTDIR)${infodir} $(DESTDIR)${infodir}/$$elt); \
-           if [ -n "${GZIP_INFO}" ] && [ -n "${GZIP_PROG}" ]; then \
-              ext=.gz; else ext=; fi; \
-           rm -f $$elt$$ext $$elt-[1-9]$$ext $$elt-[1-9][0-9]$$ext; \
-         done;)
+        if cd $(DESTDIR)${infodir}; then \
+          for elt in ${INFO_NONMISC} $${info_misc}; do \
+            (cd $${thisdir}; \
+             $(INSTALL_INFO) --remove --info-dir=$(DESTDIR)${infodir} $(DESTDIR)${infodir}/$$elt); \
+            if [ -n "${GZIP_INFO}" ] && [ -n "${GZIP_PROG}" ]; then \
+               ext=.gz; else ext=; fi; \
+            rm -f $$elt$$ext $$elt-[1-9]$$ext $$elt-[1-9][0-9]$$ext; \
+          done; \
+        fi)
        (if [ -n "${GZIP_INFO}" ] && [ -n "${GZIP_PROG}" ]; then \
            ext=.gz; else ext=; fi; \
-        cd ${mansrcdir} && for page in *.1; do \
-          rm -f $(DESTDIR)${man1dir}/$$page$$ext; done )
-       (cd $(DESTDIR)${bindir}  && rm -f $(EMACSFULL) $(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
+        if cd ${mansrcdir}; then \
+          for page in *.1; do \
+            rm -f $(DESTDIR)${man1dir}/`echo "$${page}" | sed -e 's/\.1$$//' -e '$(TRANSFORM)'`.1$$ext; done; \
+        fi)
+       (cd $(DESTDIR)${bindir} && rm -f $(EMACSFULL) $(EMACS) || true)
+       (if cd $(DESTDIR)${icondir}; then \
+          rm -f hicolor/*x*/apps/${EMACS_NAME}.png \
+            hicolor/scalable/apps/${EMACS_NAME}.svg \
+            hicolor/scalable/mimetypes/`echo emacs-document | sed '$(TRANSFORM)'`.svg; \
+       fi)
+       -rm -f $(DESTDIR)${desktopdir}/${EMACS_NAME}.desktop
        for file in snake-scores tetris-scores; do \
          file=$(DESTDIR)${gamedir}/$${file}; \
          [ -s $${file} ] || rm -f $$file; \
@@ -729,6 +745,7 @@ mostlyclean: FRC
 ###
 ###      Delete `.dvi' files here if they are not part of the distribution.
 clean: FRC
+       -rm -f etc/emacs.tmpdesktop
        (cd src;      $(MAKE) $(MFLAGS) clean)
        (cd oldXMenu; $(MAKE) $(MFLAGS) clean)
        (cd lwlib;    $(MAKE) $(MFLAGS) clean)