Updates for compiling with Gtk+ 3.0 (--with-x-toolkit=gtk3).

[gnu-emacs] / doc / emacs / Makefile.in

diff --git a/doc/emacs/Makefile.in b/doc/emacs/Makefile.in
index 441a08f3be0a9c299fa7558e82df2ca832c9cb39..0ba396e64274d5b8f65cad0474cf19b43087f748 100644 (file)
--- a/doc/emacs/Makefile.in
+++ b/doc/emacs/Makefile.in
@@ -1,8 +1,6 @@
 #### Makefile for the Emacs Manual
 
-# Copyright (C) 1994, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-#   2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
-#   Free Software Foundation, Inc.
+# Copyright (C) 1994, 1996-2011  Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
 
@@ -39,14 +37,16 @@ texinfodir = $(srcdir)/../misc
 
 # The makeinfo program is part of the Texinfo distribution.
 # Use --force so that it generates output even if there are errors.
-MAKEINFO = makeinfo --force -I $(srcdir)
+MAKEINFO = @MAKEINFO@
+MAKEINFO_OPTS = --force -I $(srcdir)
 
 TEXI2DVI = texi2dvi
 TEXI2PDF = texi2pdf
 DVIPS = dvips
 
 
-ENVADD = TEXINPUTS="$(srcdir):$(texinfodir):$(TEXINPUTS)" MAKEINFO="$(MAKEINFO) -I$(srcdir)"
+ENVADD = TEXINPUTS="$(srcdir):$(texinfodir):$(TEXINPUTS)" \
+         MAKEINFO="$(MAKEINFO) $(MAKEINFO_OPTS)"
 
 
 EMACS_XTRA= \
@@ -129,7 +129,7 @@ ps: emacs.ps
 
 $(infodir)/emacs: ${EMACSSOURCES}
        $(mkinfodir)
-       $(MAKEINFO) -o $@ $<
+       $(MAKEINFO) $(MAKEINFO_OPTS) -o $@ $<
 
 emacs.dvi: ${EMACSSOURCES}
        $(ENVADD) $(TEXI2DVI) $<
@@ -141,7 +141,7 @@ emacs.pdf: ${EMACSSOURCES}
        $(ENVADD) $(TEXI2PDF) $<
 
 emacs.html: ${EMACSSOURCES}
-       $(MAKEINFO) --html -o $@ $<
+       $(MAKEINFO) $(MAKEINFO_OPTS) --html -o $@ $<
 
 emacs-xtra.dvi: $(EMACS_XTRA)
        $(ENVADD) $(TEXI2DVI) $<