diff options
| author | Glenn Morris <rgm@gnu.org> | 2014-11-04 21:01:01 -0800 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2014-11-04 21:01:01 -0800 |
| commit | 58064b4da2835acb24d0f68021c84102e0fb1c0f (patch) | |
| tree | bac4230306dbb85714d22440e510cf0cdbbabd38 /Makefile.in | |
| parent | 6cd9d8c94dd81f7aa1753b1c6320d089f0fe6fcd (diff) | |
| download | emacs-58064b4da2835acb24d0f68021c84102e0fb1c0f.tar.gz | |
* Makefile.in (install-info, uninstall): Restore pre-2012-12-13 solution
Do not merge to trunk.
Fixes: debbugs:18908
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile.in b/Makefile.in index 81fa82bb30c..ed0e2bc450f 100644 --- 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}"; \ |