Mercurial > emacs
changeset 94598:bc725ee2bc85
(MAKEINFO): New, set by configure.
(install-arch-indep): Without makeinfo, ignore any missing manuals.
(info-real): New target.
(info): Without makeinfo, do nothing, else call `info-real'.
| author | Glenn Morris <rgm@gnu.org> |
|---|---|
| date | Sat, 03 May 2008 20:16:32 +0000 |
| parents | 100982f1144d |
| children | f794a969001a |
| files | Makefile.in |
| diffstat | 1 files changed, 15 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile.in Sat May 03 20:16:15 2008 +0000 +++ b/Makefile.in Sat May 03 20:16:32 2008 +0000 @@ -84,6 +84,7 @@ C_SWITCH_X_SITE=@C_SWITCH_X_SITE@ LD_SWITCH_X_SITE=@LD_SWITCH_X_SITE@ EXEEXT=@EXEEXT@ +MAKEINFO=@MAKEINFO@ ### These help us choose version- and architecture-specific directories ### to install files in. @@ -553,6 +554,7 @@ fi; \ cd ${srcdir}/info ; \ for elt in $(INFO_FILES); do \ + test "$(MAKEINFO)" = "no" && ! 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; \ @@ -564,6 +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; \ (cd $${thisdir}; \ ${INSTALL_INFO} --info-dir=$(DESTDIR)${infodir} $(DESTDIR)${infodir}/$$elt); \ done; \ @@ -770,15 +773,23 @@ cd ${srcdir}; ./make-dist .PHONY: info dvi dist check html + +info-real: + -(cd doc/emacs; $(MAKE) $(MFLAGS) info) + -(cd doc/misc; $(MAKE) $(MFLAGS) info) + -(cd doc/lispref; $(MAKE) $(MFLAGS) info) + -(cd doc/lispintro; $(MAKE) $(MFLAGS) info) + force-info: # Note that man/Makefile knows how to # put the info files in $(srcdir), # so we can do ok running make in the build dir. info: force-info - -(cd doc/emacs; $(MAKE) $(MFLAGS) info) - -(cd doc/misc; $(MAKE) $(MFLAGS) info) - -(cd doc/lispref; $(MAKE) $(MFLAGS) info) - -(cd doc/lispintro; $(MAKE) $(MFLAGS) info) + @if test "$(MAKEINFO)" = "no"; then \ + echo "Configured without makeinfo, not building manuals" ; \ + else \ + $(MAKE) $(MFLAGS) info-real ; \ + fi # The info/dir file must be updated by hand when new manuals are added. check-info-dir: info