masscollaborationlabs/emacs
2
0
Fork 0
mirror of https://github.com/masscollaborationlabs/emacs.git synced 2025-07-03 19:03:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
Do not merge to trunk.

Fixes: debbugs:18908
This commit is contained in:
Glenn Morris 2014-11-04 21:01:01 -08:00
parent 6cd9d8c94d
commit 58064b4da2
2 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -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> 2014-10-31 Eric S. Raymond <esr@thyrsus.com>
* autogen.sh: Neutralize language specific to a repository type. * autogen.sh: Neutralize language specific to a repository type.
@ -1744,7 +1749,7 @@
2012-12-13 Andreas Schwab <schwab@suse.de> 2012-12-13 Andreas Schwab <schwab@suse.de>
* Makefile.in (install-info): Use `${MAKE} -s' for echo-info. * 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> 2012-12-11 Paul Eggert <eggert@cs.ucla.edu>

4
Makefile.in
View file

@ -658,7 +658,7 @@ install-info: info
[ -f "$(DESTDIR)${infodir}/dir" ] || \ [ -f "$(DESTDIR)${infodir}/dir" ] || \
[ ! -f ${srcdir}/info/dir ] || \ [ ! -f ${srcdir}/info/dir ] || \
${INSTALL_DATA} ${srcdir}/info/dir "$(DESTDIR)${infodir}/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 ; \ cd ${srcdir}/info ; \
for elt in ${INFO_NONMISC} $${info_misc}; do \ for elt in ${INFO_NONMISC} $${info_misc}; do \
test "$(HAVE_MAKEINFO)" = "no" && test ! -f $$elt && continue; \ test "$(HAVE_MAKEINFO)" = "no" && test ! -f $$elt && continue; \
@ -754,7 +754,7 @@ uninstall: uninstall-$(NTDIR) uninstall-doc
done done
-rm -rf "$(DESTDIR)${libexecdir}/emacs/${version}" -rm -rf "$(DESTDIR)${libexecdir}/emacs/${version}"
thisdir=`/bin/pwd`; \ 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 \ if cd "$(DESTDIR)${infodir}"; then \
for elt in ${INFO_NONMISC} $${info_misc}; do \ for elt in ${INFO_NONMISC} $${info_misc}; do \
(cd "$${thisdir}"; \ (cd "$${thisdir}"; \