From eeced60b6ca4be63abca61cab5967ee28537a8af Mon Sep 17 00:00:00 2001
From: Glenn Morris <rgm@gnu.org>
Date: Fri, 26 Oct 2012 00:39:47 -0700
Subject: [PATCH] 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.
---
 ChangeLog           |  3 +++
 Makefile.in         |  4 ++--
 lib-src/ChangeLog   |  5 +++++
 lib-src/Makefile.in | 10 ++++++----
 4 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 62a3eef7a6..c9498dbfeb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2012-10-26  Glenn Morris  <rgm@gnu.org>
 
+	* 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.
diff --git a/Makefile.in b/Makefile.in
index d7eec82949..29aed2b0be 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -259,8 +259,8 @@ 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 = `echo emacs | sed '$(TRANSFORM)'`${EXEEXT}
+EMACSFULL = `echo emacs-${version} | sed '$(TRANSFORM)'`${EXEEXT}
 
 # Subdirectories to make recursively.
 SUBDIR = lib lib-src src lisp leim
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index c88b467ee2..6b23c040b1 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,8 @@
+2012-10-26  Glenn Morris  <rgm@gnu.org>
+
+	* Makefile.in (install, uninstall): Transformations should not be
+	applied to $EXEEXT.
+
 2012-10-23  Eli Zaretskii  <eliz@gnu.org>
 
 	* makefile.w32-in (lisp2): Add cp51932.el and eucjp-ms.el, to
diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in
index c5acca2885..dcd7123bb2 100644
--- a/lib-src/Makefile.in
+++ b/lib-src/Makefile.in
@@ -244,17 +244,19 @@ install: $(DESTDIR)${archlibdir}
 	@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}) \
-- 
2.20.1