diff options
| author | Glenn Morris <rgm@gnu.org> | 2008-05-09 04:28:28 +0000 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2008-05-09 04:28:28 +0000 |
| commit | 1c73f1953349c4c5445e8ddc8e4901707725b664 (patch) | |
| tree | 67da709f897fbf1bcab811f6dd2b2d8f829b0c7c /Makefile.in | |
| parent | 09817afc31700d6611e78eb88c67710124f7c881 (diff) | |
| download | emacs-1c73f1953349c4c5445e8ddc8e4901707725b664.tar.gz | |
(install-arch-indep, info): Handle MAKEINFO == off.
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/Makefile.in b/Makefile.in index f298a7dd2b8..1637f488a01 100644 --- a/Makefile.in +++ b/Makefile.in @@ -554,7 +554,7 @@ install-arch-indep: mkdir info install-etc 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 @@ install-arch-indep: mkdir info install-etc 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 @@ force-info: # 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 |