Mercurial > emacs
changeset 112123:5e63c33ad48c
Don't use $MAKEINFO for both a flag and a program.
* configure.in (HAVE_MAKEINFO): New output variable.
(MAKEINFO): Reset to "makeinfo" if not found.
* Makefile.in (install-arch-indep, info):
Replace MAKEINFO = off with HAVE_MAKEINFO = no.
| author | Glenn Morris <rgm@gnu.org> |
|---|---|
| date | Tue, 04 Jan 2011 23:10:47 -0800 |
| parents | a28fc1581b94 |
| children | 54a3a720a04b |
| files | ChangeLog Makefile.in configure.in |
| diffstat | 3 files changed, 20 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Tue Jan 04 23:04:51 2011 -0800 +++ b/ChangeLog Tue Jan 04 23:10:47 2011 -0800 @@ -1,3 +1,10 @@ +2011-01-05 Glenn Morris <rgm@gnu.org> + + * configure.in (HAVE_MAKEINFO): New output variable. + (MAKEINFO): Reset to "makeinfo" if not found. + * Makefile.in (install-arch-indep, info): + Replace MAKEINFO = off with HAVE_MAKEINFO = no. + 2010-12-29 Ulrich Mueller <ulm@gentoo.org> * configure.in: Make gameuser configurable (Bug#7717). @@ -8670,11 +8677,10 @@ ;; Local Variables: ;; coding: utf-8 -;; add-log-time-zone-rule: t ;; End: Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2002, - 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. + 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -8691,4 +8697,3 @@ You should have received a copy of the GNU General Public License along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. -;;; arch-tag: ac61a779-1480-4884-b292-d0c39c127a73
--- a/Makefile.in Tue Jan 04 23:04:51 2011 -0800 +++ b/Makefile.in Tue Jan 04 23:10:47 2011 -0800 @@ -3,7 +3,7 @@ # DIST: that first. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -# 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 +# 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 # Free Software Foundation, Inc. # This file is part of GNU Emacs. @@ -73,7 +73,6 @@ LDFLAGS=@LDFLAGS@ CPPFLAGS=@CPPFLAGS@ EXEEXT=@EXEEXT@ -MAKEINFO=@MAKEINFO@ ### These help us choose version- and architecture-specific directories ### to install files in. @@ -140,6 +139,9 @@ reftex remember sasl sc semantic ses sieve smtpmail speedbar \ tramp url vip viper widget woman +# If no makeinfo was found and configured --without-makeinfo, "no"; else "yes". +HAVE_MAKEINFO=@HAVE_MAKEINFO@ + # Directory for local state files for all programs. localstatedir=@localstatedir@ @@ -572,7 +574,7 @@ fi; \ cd ${srcdir}/info ; \ for elt in $(INFO_FILES); do \ - test "$(MAKEINFO)" = "off" && ! test -e $$elt && continue; \ + test "$(HAVE_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; \ @@ -588,7 +590,7 @@ if [ `(cd ${srcdir}/info && /bin/pwd)` != `(cd $(DESTDIR)${infodir} && /bin/pwd)` ]; \ then \ for elt in $(INFO_FILES); do \ - test "$(MAKEINFO)" = "off" && ! test -e $$elt && continue; \ + test "$(HAVE_MAKEINFO)" = "no" && ! test -e $$elt && continue; \ (cd $${thisdir}; \ ${INSTALL_INFO} --info-dir=$(DESTDIR)${infodir} $(DESTDIR)${infodir}/$$elt); \ done; \ @@ -834,7 +836,7 @@ # and it's not worth it. This case is only relevant if you download a # release, then change the .texi files. info: force-info - @if test "$(MAKEINFO)" = "off"; then \ + @if test "$(HAVE_MAKEINFO)" = "no"; then \ echo "Configured --without-makeinfo, not building manuals" ; \ else \ $(MAKE) $(MFLAGS) info-real ; \
--- a/configure.in Tue Jan 04 23:04:51 2011 -0800 +++ b/configure.in Tue Jan 04 23:10:47 2011 -0800 @@ -791,9 +791,12 @@ ## should test for it as it does for any other build requirement. ## We use the presence of $srcdir/info/emacs to distinguish a release, ## with pre-built manuals, from a Bazaar checkout. +HAVE_MAKEINFO=yes + if test "$MAKEINFO" = "no"; then + MAKEINFO=makeinfo if test "x${with_makeinfo}" = "xno"; then - MAKEINFO=off + HAVE_MAKEINFO=no elif test ! -e $srcdir/info/emacs; then AC_MSG_ERROR( [You do not seem to have makeinfo >= 4.6, and your source tree does not seem to have pre-built manuals in the `info' directory. @@ -801,6 +804,7 @@ with the `--without-makeinfo' option to build without the manuals.] ) fi fi +AC_SUBST(HAVE_MAKEINFO) dnl Add our options to ac_link now, after it is set up.