[Emacs-diffs] /srv/bzr/emacs/trunk r110671: Program name transformations should not be applied to $EXEEXT.

[Glenn Morris]

------------------------------------------------------------
revno: 110671
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Fri 2012-10-26 00:39:47 -0700
message:
  Program name transformations should not be applied to $EXEEXT.
  
  * Makefile.in (EMACS, EMACSFULL):
  * lib-src/Makefile.in (install, uninstall):
  Transformations should not be applied to $EXEEXT.
modified:
  ChangeLog
  Makefile.in
  lib-src/ChangeLog
  lib-src/Makefile.in

=== modified file 'ChangeLog'
--- a/ChangeLog 2012-10-26 07:32:40 +0000
+++ b/ChangeLog 2012-10-26 07:39:47 +0000
@@ -1,5 +1,8 @@
 2012-10-26  Glenn Morris  <address@hidden>
 
+       * Makefile.in (EMACS, EMACSFULL): Transformations should not be
+       applied to $EXEEXT.
+
        * Makefile.in (uninstall): Don't abort if some directories are missing.
        Apply transformation rules to manual pages, desktop and icon files.
        No more emacs22 icons to uninstall.

=== modified file 'Makefile.in'
--- a/Makefile.in       2012-10-26 07:32:40 +0000
+++ b/Makefile.in       2012-10-26 07:39:47 +0000
@@ -259,8 +259,8 @@
 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 = `echo emacs | sed '$(TRANSFORM)'`${EXEEXT}
+EMACSFULL = `echo emacs-${version} | sed '$(TRANSFORM)'`${EXEEXT}
 
 # Subdirectories to make recursively.
 SUBDIR = lib lib-src src lisp leim

=== modified file 'lib-src/ChangeLog'
--- a/lib-src/ChangeLog 2012-10-23 17:09:55 +0000
+++ b/lib-src/ChangeLog 2012-10-26 07:39:47 +0000
@@ -1,3 +1,8 @@
+2012-10-26  Glenn Morris  <address@hidden>
+
+       * Makefile.in (install, uninstall): Transformations should not be
+       applied to $EXEEXT.
+
 2012-10-23  Eli Zaretskii  <address@hidden>
 
        * makefile.w32-in (lisp2): Add cp51932.el and eucjp-ms.el, to

=== modified file 'lib-src/Makefile.in'
--- a/lib-src/Makefile.in       2012-08-01 17:54:06 +0000
+++ b/lib-src/Makefile.in       2012-10-26 07:39:47 +0000
@@ -244,17 +244,19 @@
        @echo "Installing utilities for users to run."
        umask 022; ${MKDIR_P} $(DESTDIR)${bindir}
        for file in ${INSTALLABLES} ; do \
-         $(INSTALL_PROGRAM) $(INSTALL_STRIP) $${file} 
$(DESTDIR)${bindir}/`echo $${file} | sed '$(TRANSFORM)'` ; \
+         $(INSTALL_PROGRAM) $(INSTALL_STRIP) $${file} 
$(DESTDIR)${bindir}/`echo $${file} | sed -e 's/${EXEEXT}$$//' -e 
'$(TRANSFORM)'`${EXEEXT} ; \
        done
        for file in ${INSTALLABLE_SCRIPTS} ; do \
          $(INSTALL_SCRIPT) ${srcdir}/$${file} $(DESTDIR)${bindir}/`echo 
$${file} | sed '$(TRANSFORM)'`  ; \
        done
 
 uninstall:
-       (cd $(DESTDIR)${bindir}; \
-       for file in ${INSTALLABLES} ${INSTALLABLE_SCRIPTS}; do \
+       for file in ${INSTALLABLES}; do \
+         rm -f $(DESTDIR)${bindir}/`echo $${file} | sed -e 's/${EXEEXT}$$//' 
-e '$(TRANSFORM)'`${EXEEXT} ; \
+       done
+       for file in ${INSTALLABLE_SCRIPTS}; do \
          rm -f $(DESTDIR)${bindir}/`echo $${file} | sed '$(TRANSFORM)'` ; \
-       done)
+       done
        if [ -d $(DESTDIR)${archlibdir} ]; then \
          (cd $(DESTDIR)${archlibdir} && \
           rm -f ${UTILITIES} ${INSTALLABLES} ${SCRIPTS} 
${INSTALLABLE_SCRIPTS}) \