#### Makefile for the Emacs Manual
-# Copyright (C) 1994, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-# 2004, 2005, 2006, 2007, 2008, 2009, 2010
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1996-2011 Free Software Foundation, Inc.
# This file is part of GNU Emacs.
# 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 --enable-encoding -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= \
${srcdir}/windows.texi \
${srcdir}/frames.texi \
${srcdir}/mule.texi \
- ${srcdir}/major.texi \
+ ${srcdir}/modes.texi \
${srcdir}/indent.texi \
${srcdir}/text.texi \
${srcdir}/programs.texi \
${srcdir}/dired.texi \
${srcdir}/calendar.texi \
${srcdir}/misc.texi \
+ ${srcdir}/package.texi \
${srcdir}/custom.texi \
${srcdir}/trouble.texi \
${srcdir}/cmdargs.texi \
## This seems pointless. The info/ directory exists in both the
## repository and the release tarfiles. We do not use any
-## equivalent of mkdir -p/mkinstalldirs, so this is not a general
+## equivalent of mkdir -p/install-sh -d, so this is not a general
## solution anyway. The second test -d is for parallel builds.
mkinfodir = @test -d ${infodir} || mkdir ${infodir} || test -d ${infodir}
$(infodir)/emacs: ${EMACSSOURCES}
$(mkinfodir)
- $(MAKEINFO) -o $@ $<
+ $(MAKEINFO) $(MAKEINFO_OPTS) -o $@ $<
emacs.dvi: ${EMACSSOURCES}
$(ENVADD) $(TEXI2DVI) $<
$(ENVADD) $(TEXI2PDF) $<
emacs.html: ${EMACSSOURCES}
- $(MAKEINFO) --html -o $@ $<
+ $(MAKEINFO) $(MAKEINFO_OPTS) --html -o $@ $<
emacs-xtra.dvi: $(EMACS_XTRA)
$(ENVADD) $(TEXI2DVI) $<