From 1a9c683079f638f251eee7a17f9c6ae369d30ef7 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Mon, 15 Oct 2012 16:56:07 -0400 Subject: [PATCH] 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. --- ChangeLog | 6 ++++++ Makefile.in | 20 ++++++++++++++------ etc/NEWS | 39 +++++++++++++++++++++++++-------------- 3 files changed, 45 insertions(+), 20 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9c839658429..0d45d3440c6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2012-10-15 Glenn Morris + + * Makefile.in (install-man, install-etc): + Apply $TRANSFORM. (Bug#12536#34) + (clean): Delete etc/emacs.tmpdesktop. + 2012-10-11 Kenichi Handa * .bzrignore: Add several files under admin/charsets. diff --git a/Makefile.in b/Makefile.in index 571013e3244..95f851b0ada 100644 --- a/Makefile.in +++ b/Makefile.in @@ -622,18 +622,24 @@ install-man: 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 @@ install-etc: ( 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 @@ 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) diff --git a/etc/NEWS b/etc/NEWS index 5a310d8f82c..337dfc31aff 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -47,7 +47,7 @@ no warnings; on older and on non-GNU systems the generated warnings 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 @@ overwriting "emacs" in the installation bin/ directory with a link 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 @@ The PCL-CVS commands are still available via the keyboard. --- *** 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 @@ The global binding for `M-=', `count-words-region' is in effect. 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 @@ inefficiency, and not namespace-clean. * 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 @@ describing the cycle. ** 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 @@ See the "Face Attributes" section of the Elisp manual. *** `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 @@ See the "Face Attributes" section of the Elisp manual. * 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 -- 2.11.4.GIT