merge trun

3 files changed, 21 insertions, 6 deletions

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index bc0e5c9a3d2..03cddc6a035 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,15 @@
+2012-10-26  Glenn Morris  <rgm@gnu.org>
+
+        * Makefile.in (uninstall): No INSTALLABLES live in archlibdir.
+
+        * 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
+        follow src/lisp.mk.
+
 2012-10-21  Glenn Morris  <rgm@gnu.org>
 
         * make-docfile.c (scan_lisp_file): Add cp51932.el and eucjp-ms.el.
diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in
index c5acca28856..d271bb3a4fa 100644
--- a/lib-src/Makefile.in
+++ b/lib-src/Makefile.in
@@ -244,20 +244,21 @@ 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}) \
+          (cd $(DESTDIR)${archlibdir} && rm -f ${UTILITIES} ${SCRIPTS}) \
         fi
 
 mostlyclean:
diff --git a/lib-src/makefile.w32-in b/lib-src/makefile.w32-in
index 640e8a7c468..f3ab4421fd3 100644
--- a/lib-src/makefile.w32-in
+++ b/lib-src/makefile.w32-in
@@ -229,6 +229,8 @@ lisp2 = \
         $(lispsource)language/greek.elc \
         $(lispsource)language/hebrew.elc \
         $(lispsource)language/japanese.elc \
+        $(lispsource)international/cp51932.el \
+        $(lispsource)international/eucjp-ms.el \
         $(lispsource)language/korean.elc \
         $(lispsource)language/lao.elc \
         $(lispsource)language/cham.elc \