diff options
| author | Nicolas Avrutin | 2012-12-11 13:37:53 -0500 |
|---|---|---|
| committer | Glenn Morris | 2012-12-11 13:37:53 -0500 |
| commit | 02925206eb7c5b8fd36f65b30b7beffdccba15ac (patch) | |
| tree | 64402345471b8df6f130da457027c211c673e52e | |
| parent | e8c6e965f3043a68a76863081e4d096afc5bdf22 (diff) | |
| download | emacs-02925206eb7c5b8fd36f65b30b7beffdccba15ac.tar.gz emacs-02925206eb7c5b8fd36f65b30b7beffdccba15ac.zip | |
Fix for install-info in non-English locales (tiny change)
* Makefile.in (install-info, uninstall):
Ensure make's messages about changing directories are in English.
Fixes: debbugs:13142
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | Makefile.in | 4 |
2 files changed, 7 insertions, 2 deletions
| @@ -1,3 +1,8 @@ | |||
| 1 | 2012-12-11 Nicolas Richard <theonewiththeevillook@yahoo.fr> (tiny change) | ||
| 2 | |||
| 3 | * Makefile.in (install-info, uninstall): Ensure make's messages | ||
| 4 | about changing directories are in English. (Bug#13143) | ||
| 5 | |||
| 1 | 2012-12-05 Glenn Morris <rgm@gnu.org> | 6 | 2012-12-05 Glenn Morris <rgm@gnu.org> |
| 2 | 7 | ||
| 3 | * configure.ac: Handle info/ files with or without ".info" extension. | 8 | * configure.ac: Handle info/ files with or without ".info" extension. |
diff --git a/Makefile.in b/Makefile.in index 78630ef58ff..e8a506e7cea 100644 --- a/Makefile.in +++ b/Makefile.in | |||
| @@ -603,7 +603,7 @@ install-info: info | |||
| 603 | [ -f dir ] || \ | 603 | [ -f dir ] || \ |
| 604 | (cd $${thisdir}; \ | 604 | (cd $${thisdir}; \ |
| 605 | ${INSTALL_DATA} ${srcdir}/info/dir $(DESTDIR)${infodir}/dir) ; \ | 605 | ${INSTALL_DATA} ${srcdir}/info/dir $(DESTDIR)${infodir}/dir) ; \ |
| 606 | info_misc=`cd $${thisdir}/doc/misc; ${MAKE} echo-info | sed '/ing directory/d'`; \ | 606 | info_misc=`cd $${thisdir}/doc/misc; LANG=C ${MAKE} echo-info | sed '/ing directory/d'`; \ |
| 607 | cd ${srcdir}/info ; \ | 607 | cd ${srcdir}/info ; \ |
| 608 | for elt in ${INFO_NONMISC} $${info_misc}; do \ | 608 | for elt in ${INFO_NONMISC} $${info_misc}; do \ |
| 609 | test "$(HAVE_MAKEINFO)" = "no" && test ! -f $$elt && continue; \ | 609 | test "$(HAVE_MAKEINFO)" = "no" && test ! -f $$elt && continue; \ |
| @@ -685,7 +685,7 @@ uninstall: | |||
| 685 | done | 685 | done |
| 686 | -rm -rf $(DESTDIR)${libexecdir}/emacs/${version} | 686 | -rm -rf $(DESTDIR)${libexecdir}/emacs/${version} |
| 687 | thisdir=`/bin/pwd`; \ | 687 | thisdir=`/bin/pwd`; \ |
| 688 | (info_misc=`cd doc/misc; ${MAKE} echo-info | sed '/ing directory/d'`; \ | 688 | (info_misc=`cd doc/misc; LANG=C ${MAKE} echo-info | sed '/ing directory/d'`; \ |
| 689 | if cd $(DESTDIR)${infodir}; then \ | 689 | if cd $(DESTDIR)${infodir}; then \ |
| 690 | for elt in ${INFO_NONMISC} $${info_misc}; do \ | 690 | for elt in ${INFO_NONMISC} $${info_misc}; do \ |
| 691 | (cd $${thisdir}; \ | 691 | (cd $${thisdir}; \ |