[Emacs-diffs] /srv/bzr/emacs/trunk r110554: Apply program-transform-name etc in more places (bug#12536#34)

[Glenn Morris]

------------------------------------------------------------
revno: 110554
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Mon 2012-10-15 16:56:07 -0400
message:
  Apply program-transform-name etc in more places (bug#12536#34)
  
  * Makefile.in (install-man, install-etc): Apply $TRANSFORM.  
  (clean): Delete etc/emacs.tmpdesktop.
  
  * .bzrignore: Add etc/emacs.tmpdesktop.
  
  * etc/NEWS: Mention this.  Unrelated copyedits.
modified:
  .bzrignore
  ChangeLog
  Makefile.in
  etc/NEWS

=== modified file '.bzrignore'
--- a/.bzrignore        2012-10-11 11:26:26 +0000
+++ b/.bzrignore        2012-10-15 20:56:07 +0000
@@ -66,6 +66,7 @@
 !doc/lispintro/cons-*.pdf
 !doc/lispintro/drawers.pdf
 !doc/lispintro/lambda-*.pdf
+etc/emacs.tmpdesktop
 etc/refcards/*.aux
 etc/refcards/*.log
 info/*.info

=== modified file 'ChangeLog'
--- a/ChangeLog 2012-10-11 11:29:47 +0000
+++ b/ChangeLog 2012-10-15 20:56:07 +0000
@@ -1,3 +1,9 @@
+2012-10-15  Glenn Morris  <address@hidden>
+
+       * Makefile.in (install-man, install-etc):
+       Apply $TRANSFORM.  (Bug#12536#34)
+       (clean): Delete etc/emacs.tmpdesktop.
+
 2012-10-11  Kenichi Handa  <address@hidden>
 
        * .bzrignore: Add several files under admin/charsets.

=== modified file 'Makefile.in'
--- a/Makefile.in       2012-09-29 22:01:57 +0000
+++ b/Makefile.in       2012-10-15 20:56:07 +0000
@@ -622,18 +622,24 @@
        thisdir=`/bin/pwd`; \
        cd ${mansrcdir}; \
        for page in *.1; do \
+         dest=`echo "$${page}" | sed '$(TRANSFORM)'`; \
          (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
+       dest=`echo emacs | sed '$(TRANSFORM)'`; \
+       tmp=etc/emacs.tmpdesktop; rm -f $${tmp}; \
+       sed -e "/^Exec=emacs/ s/emacs/$${dest}/" \
+         -e "/^Icon=emacs/ s/emacs/$${dest}/" \
+         ${srcdir}/etc/emacs.desktop > $${tmp}; \
+       ${INSTALL_DATA} $${tmp} $(DESTDIR)${desktopdir}/$${dest}.desktop; \
+       rm -f $${tmp}
        thisdir=`/bin/pwd`; \
        cd ${iconsrcdir} || exit 1; umask 022 ; \
        for dir in */*/apps */*/mimetypes; do \
@@ -641,8 +647,9 @@
          ( cd $${thisdir}; ${MKDIR_P} $(DESTDIR)${icondir}/$${dir} ) ; \
          for icon in $${dir}/*.*; do \
            [ -r $${icon} ] || continue ; \
+           dest=`echo "$${icon}" | sed '$(TRANSFORM)'` ; \
            ( cd $${thisdir}; \
-             ${INSTALL_DATA} ${iconsrcdir}/$${icon} 
$(DESTDIR)${icondir}/$${icon} ) \
+             ${INSTALL_DATA} ${iconsrcdir}/$${icon} 
$(DESTDIR)${icondir}/$${dest} ) \
            || exit 1; \
          done ; \
        done
@@ -729,6 +736,7 @@
 ###
 ###      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)

=== modified file 'etc/NEWS'
--- a/etc/NEWS  2012-10-13 01:18:52 +0000
+++ b/etc/NEWS  2012-10-15 20:56:07 +0000
@@ -47,7 +47,7 @@
 may be useful.
 
 ---
-** The configuration option '--enable-use-lisp-union-type' has been
+** The configure option '--enable-use-lisp-union-type' has been
 renamed to '--enable-check-lisp-object-type', as the resulting
 Lisp_Object type no longer uses a union to implement the compile time
 check that this option enables.
@@ -62,6 +62,12 @@
 to emacs-VERSION.
 
 ---
+** The configure option `--program-transform-name' applies to more than
+just the installed binaries.  Now it also affects the man pages, icons,
+and desktop file.  It does not affect the info pages, since this would
+break links between the various manuals.
+
+---
 ** Emacs uses libtinfo in preference to libncurses, if available.
 
 ---
@@ -203,7 +209,9 @@
 ---
 *** Fullscreen and frame parameter fullscreen is supported.
 ---
-*** A file dialog is used when open/saved is done from the menu/toolbar.
+*** A file dialog is used for open/save operations initiated from the
+menu/toolbar.
+
 
 * Editing Changes in Emacs 24.3
 
@@ -415,8 +423,8 @@
 channel keys found, if any.
 
 ** Flymake uses fringe bitmaps to indicate errors and warnings.
-See flymake-fringe-indicator-position, flymake-error-bitmap and
-flymake-warning-bitmap.
+See `flymake-fringe-indicator-position', `flymake-error-bitmap' and
+`flymake-warning-bitmap'.
 
 ** Follow mode
 
@@ -634,6 +642,10 @@
 
 
 * New Modes and Packages in Emacs 24.3
+
+FIXME? erc-desktop-notifications.el, gv.el, profiler.el,
+gnus-notifications.el, mm-archive.el
+
 
 * Incompatible Lisp Changes in Emacs 24.3
 
@@ -848,7 +860,7 @@
 ** Miscellaneous new functions:
 
 *** `autoloadp'
-*** `autoload-do-load'.
+*** `autoload-do-load'
 +++
 *** `buffer-narrowed-p' tests if the buffer is narrowed.
 *** `file-name-base' returns a file name sans directory and extension.
@@ -873,7 +885,7 @@
 
 *** `automount-dir-prefix'
 *** `buffer-has-markers-at'
-*** `macro-declaration-function' (use `macro-declarations-alist').
+*** `macro-declaration-function' (use `macro-declarations-alist')
 *** `window-system-version'
 *** `dired-pop-to-buffer' (use `dired-mark-pop-up')
 *** `query-replace-interactive'
@@ -881,21 +893,20 @@
 
 * Changes in Emacs 24.3 on non-free operating systems
 
-** New configure.bat options on MS-Windows:
-
-*** --without-libxml2 omits support for libxml2, even if its presence
-is detected.
++++
+** On MS Windows, you can pass --without-libxml2 to configure.bat to omit
+support for libxml2, even if its presence is detected.
 
 ** When invoked with the -nw switch to run on the Windows text-mode terminal,
 Emacs now supports mouse highlight, help-echo (in the echo area), and
-mouse-autoselect-window.
+`mouse-autoselect-window'.
 
-** Two new functions are available in Cygwin builds of Emacs:
-cygwin-convert-path-from-windows and cygwin-convert-path-to-windows.
+** Two new functions are available in Cygwin builds:
+`cygwin-convert-path-from-windows' and `cygwin-convert-path-to-windows'.
 These functions allow Lisp code to access the Cygwin file-name mapping
 machinery to convert between Cygwin and Windows-native file names.
 
-** On MS-Windows Vista and later Emacs now supports symbolic links.
+** On MS Windows Vista and later Emacs now supports symbolic links.
 
 * Changes in Emacs 24.2