X-Git-Url: http://git.hcoop.net/bpt/emacs.git/blobdiff_plain/7c82f3e23e37cc848a38b1f8be7149fd672a6393..ab422c4d6899b1442cb6954c1829c1fb656b006c:/doc/emacs/makefile.w32-in

diff --git a/doc/emacs/makefile.w32-in b/doc/emacs/makefile.w32-in
index 80e873ad89..e289c46784 100644
--- a/doc/emacs/makefile.w32-in
+++ b/doc/emacs/makefile.w32-in
@@ -1,7 +1,6 @@
 #### -*- Makefile -*- for the Emacs Manual
 
-# Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
-#   Free Software Foundation, Inc.
+# Copyright (C) 2003-2013 Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
 
@@ -28,9 +27,12 @@ srcdir=.
 infodir = $(srcdir)/../../info
 
 # The makeinfo program is part of the Texinfo distribution.
-MAKEINFO = makeinfo --force
+MAKEINFO = makeinfo
+MAKEINFO_OPTS = --force --enable-encoding -I$(srcdir)
 MULTI_INSTALL_INFO = $(srcdir)\..\..\nt\multi-install-info.bat
-INFO_TARGETS = $(infodir)/emacs
+INFO_EXT=.info
+INFO_OPTS=--no-split
+INFO_TARGETS = $(infodir)/emacs$(INFO_EXT)
 DVI_TARGETS = 	emacs.dvi
 INFOSOURCES = info.texi
 
@@ -41,7 +43,7 @@ INFOSOURCES = info.texi
 
 TEXI2DVI = texi2dvi
 ENVADD = $(srcdir)\..\..\nt\envadd.bat "TEXINPUTS=$(srcdir);$(TEXINPUTS)" \
-	 "MAKEINFO=$(MAKEINFO) -I$(srcdir)" /C
+	 "MAKEINFO=$(MAKEINFO) $(MAKEINFO_OPTS)" /C
 
 EMACS_XTRA=\
 	$(srcdir)/arevert-xtra.texi \
@@ -76,7 +78,7 @@ EMACSSOURCES= \
 	$(srcdir)/windows.texi \
 	$(srcdir)/frames.texi \
 	$(srcdir)/mule.texi \
-	$(srcdir)/major.texi \
+	$(srcdir)/modes.texi \
 	$(srcdir)/indent.texi \
 	$(srcdir)/text.texi \
 	$(srcdir)/programs.texi \
@@ -88,6 +90,7 @@ EMACSSOURCES= \
 	$(srcdir)/dired.texi \
 	$(srcdir)/calendar.texi \
 	$(srcdir)/misc.texi \
+	$(srcdir)/package.texi \
 	$(srcdir)/custom.texi \
 	$(srcdir)/trouble.texi \
 	$(srcdir)/cmdargs.texi \
@@ -113,21 +116,26 @@ dvi: $(DVI_TARGETS)
 $(infodir)/dir:
 	$(MULTI_INSTALL_INFO) --info-dir=$(infodir) $(INFO_TARGETS)
 
-$(infodir)/emacs: $(EMACSSOURCES)
-	$(MAKEINFO) emacs.texi
+$(infodir)/emacs$(INFO_EXT): $(EMACSSOURCES)
+	$(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ emacs.texi
 
 emacs.dvi: $(EMACSSOURCES)
 	$(ENVADD) $(TEXI2DVI) $(srcdir)/emacs.texi
 
+emacs.html: $(EMACSSOURCES)
+	$(MAKEINFO) $(MAKEINFO_OPTS) --html -o $@ emacs.texi
+
 emacs-xtra.dvi: emacs-xtra.texi $(EMACS_XTRA)
 	$(ENVADD) $(TEXI2DVI) $(srcdir)/emacs-xtra.texi
 
 mostlyclean:
 	- $(DEL) *.log *.cp *.fn *.ky *.pg *.vr core *.tp *.core gnustmp.*
 
+## FIXME $(infodir)/emacs* deletes too much, eg emacs-mime.
 clean: mostlyclean
 	- $(DEL) *.dvi
 	- $(DEL) $(infodir)/emacs*
+	- $(DEL_TREE) emacs.html
 
 distclean: clean
 	- $(DEL) makefile