* Makefile.in (install-info, uninstall): Restore pre-2012-12-13 solution

Do not merge to trunk.

Fixes: debbugs:18908

diff --git a/ChangeLog b/ChangeLog
index cc49e183b46173b2e6424e15c117db3490450fa2..83d7a9833e4c265f1920974d792c0cb580486942 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2014-11-05  Glenn Morris  <rgm@gnu.org>
+
+       * Makefile.in (install-info, uninstall): Restore pre-2012-12-13
+       solution.  (Bug#18908)
+
 2014-10-31  Eric S. Raymond  <esr@thyrsus.com>
 
        * autogen.sh: Neutralize language specific to a repository type.
@@ -1744,7 +1749,7 @@
 2012-12-13  Andreas Schwab  <schwab@suse.de>
 
        * Makefile.in (install-info): Use `${MAKE} -s' for echo-info.
-       (uninstall): Likewise.  (Bug#13143)
+       (uninstall): Likewise.  (Bug#13142)
 
 2012-12-11  Paul Eggert  <eggert@cs.ucla.edu>
 

diff --git a/Makefile.in b/Makefile.in
index 81fa82bb30cc4c8153118bd00bd30aa39901fb88..ed0e2bc450f66b35581d37e952ab951fb3050c22 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -658,7 +658,7 @@ install-info: info
           [ -f "$(DESTDIR)${infodir}/dir" ] || \
              [ ! -f ${srcdir}/info/dir ] || \
              ${INSTALL_DATA} ${srcdir}/info/dir "$(DESTDIR)${infodir}/dir"; \
-          info_misc=`cd doc/misc && $(QUIET_SUBMAKE) $(MAKE) -s echo-info`; \
+          info_misc=`cd doc/misc && LANG=C $(QUIET_SUBMAKE) $(MAKE) -s echo-info | sed '/ing directory/d'`; \
           cd ${srcdir}/info ; \
           for elt in ${INFO_NONMISC} $${info_misc}; do \
              test "$(HAVE_MAKEINFO)" = "no" && test ! -f $$elt && continue; \
@@ -754,7 +754,7 @@ uninstall: uninstall-$(NTDIR) uninstall-doc
        done
        -rm -rf "$(DESTDIR)${libexecdir}/emacs/${version}"
        thisdir=`/bin/pwd`; \
-       (info_misc=`cd doc/misc && $(QUIET_SUBMAKE) $(MAKE) -s echo-info`; \
+       (info_misc=`cd doc/misc && LANG=C $(QUIET_SUBMAKE) $(MAKE) -s echo-info | sed '/ing directory/d'`; \
         if cd "$(DESTDIR)${infodir}"; then \
           for elt in ${INFO_NONMISC} $${info_misc}; do \
             (cd "$${thisdir}"; \