[Emacs-diffs] emacs-24 r117669: * Makefile.in (install-info, uninstall): Restore pre-2012-12-13 solution

[Glenn Morris]

------------------------------------------------------------
revno: 117669
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/18908
committer: Glenn Morris <address@hidden>
branch nick: emacs-24
timestamp: Tue 2014-11-04 21:01:01 -0800
message:
  * Makefile.in (install-info, uninstall): Restore pre-2012-12-13  solution
  Do not merge to trunk.
modified:
  ChangeLog                      changelog-20091113204419-o5vbwnq5f7feedwu-1538
  Makefile.in                    makefile.in-20091113204419-o5vbwnq5f7feedwu-446

=== modified file 'ChangeLog'
--- a/ChangeLog 2014-10-31 09:03:23 +0000
+++ b/ChangeLog 2014-11-05 05:01:01 +0000
@@ -1,3 +1,8 @@
+2014-11-05  Glenn Morris  <address@hidden>
+
+       * Makefile.in (install-info, uninstall): Restore pre-2012-12-13
+       solution.  (Bug#18908)
+
 2014-10-31  Eric S. Raymond  <address@hidden>
 
        * autogen.sh: Neutralize language specific to a repository type.
@@ -1744,7 +1749,7 @@
 2012-12-13  Andreas Schwab  <address@hidden>
 
        * Makefile.in (install-info): Use `${MAKE} -s' for echo-info.
-       (uninstall): Likewise.  (Bug#13143)
+       (uninstall): Likewise.  (Bug#13142)
 
 2012-12-11  Paul Eggert  <address@hidden>
 

=== modified file 'Makefile.in'
--- a/Makefile.in       2014-10-23 05:52:47 +0000
+++ b/Makefile.in       2014-11-05 05:01:01 +0000
@@ -658,7 +658,7 @@
           [ -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 @@
        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}"; \