HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge changes from emacs-23 branch
[bpt/emacs.git]
/
doc
/
emacs
/
Makefile.in
diff --git
a/doc/emacs/Makefile.in
b/doc/emacs/Makefile.in
index
cdbd718
..
aca17ce
100644
(file)
--- a/
doc/emacs/Makefile.in
+++ b/
doc/emacs/Makefile.in
@@
-1,8
+1,6
@@
#### Makefile for the Emacs Manual
#### 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.
# 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.
# 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
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= \
EMACS_XTRA= \
@@
-111,7
+111,7
@@
EMACSSOURCES= \
## This seems pointless. The info/ directory exists in both the
## repository and the release tarfiles. We do not use any
## 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}
## solution anyway. The second test -d is for parallel builds.
mkinfodir = @test -d ${infodir} || mkdir ${infodir} || test -d ${infodir}
@@
-129,7
+129,7
@@
ps: emacs.ps
$(infodir)/emacs: ${EMACSSOURCES}
$(mkinfodir)
$(infodir)/emacs: ${EMACSSOURCES}
$(mkinfodir)
- $(MAKEINFO) -o $@ $<
+ $(MAKEINFO)
$(MAKEINFO_OPTS)
-o $@ $<
emacs.dvi: ${EMACSSOURCES}
$(ENVADD) $(TEXI2DVI) $<
emacs.dvi: ${EMACSSOURCES}
$(ENVADD) $(TEXI2DVI) $<
@@
-141,7
+141,7
@@
emacs.pdf: ${EMACSSOURCES}
$(ENVADD) $(TEXI2PDF) $<
emacs.html: ${EMACSSOURCES}
$(ENVADD) $(TEXI2PDF) $<
emacs.html: ${EMACSSOURCES}
- $(MAKEINFO) --html -o $@ $<
+ $(MAKEINFO)
$(MAKEINFO_OPTS)
--html -o $@ $<
emacs-xtra.dvi: $(EMACS_XTRA)
$(ENVADD) $(TEXI2DVI) $<
emacs-xtra.dvi: $(EMACS_XTRA)
$(ENVADD) $(TEXI2DVI) $<