Mercurial > emacs
changeset 94783:4b2ac57a4d30
(install-arch-indep, info): Handle MAKEINFO == off.
| author | Glenn Morris <rgm@gnu.org> |
|---|---|
| date | Fri, 09 May 2008 04:28:15 +0000 |
| parents | 8398a37f304f |
| children | 7b5cf9382c26 |
| files | Makefile.in |
| diffstat | 1 files changed, 7 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile.in Fri May 09 04:27:56 2008 +0000 +++ b/Makefile.in Fri May 09 04:28:15 2008 +0000 @@ -554,7 +554,7 @@ fi; \ cd ${srcdir}/info ; \ for elt in $(INFO_FILES); do \ - test "$(MAKEINFO)" = "no" && ! test -e $$elt && continue; \ + test "$(MAKEINFO)" = "off" && ! test -e $$elt && continue; \ for f in `ls $$elt $$elt-[1-9] $$elt-[1-9][0-9] 2>/dev/null`; do \ ${INSTALL_DATA} $$f $(DESTDIR)${infodir}/$$f; \ chmod a+r $(DESTDIR)${infodir}/$$f; \ @@ -566,7 +566,7 @@ if [ `(cd ${srcdir}/info && /bin/pwd)` != `(cd $(DESTDIR)${infodir} && /bin/pwd)` ]; \ then \ for elt in $(INFO_FILES); do \ - test "$(MAKEINFO)" = "no" && ! test -e $$elt && continue; \ + test "$(MAKEINFO)" = "off" && ! test -e $$elt && continue; \ (cd $${thisdir}; \ ${INSTALL_INFO} --info-dir=$(DESTDIR)${infodir} $(DESTDIR)${infodir}/$$elt); \ done; \ @@ -785,8 +785,11 @@ # put the info files in $(srcdir), # so we can do ok running make in the build dir. info: force-info - @if test "$(MAKEINFO)" = "no"; then \ - echo "Configured without makeinfo, not building manuals" ; \ + @if test "$(MAKEINFO)" = "off"; then \ + echo "Configured --without-makeinfo, not building manuals" ; \ + elif test "$(MAKEINFO)" = "no"; then \ + echo "makeinfo is missing - cannot build manuals" ; \ + exit 1 ; \ else \ $(MAKE) $(MFLAGS) info-real ; \ fi