Merge from emacs-24; up to 2012-12-19T19:51:40Z!monnier@iro.umontreal.ca

[gnu-emacs] / doc / lispintro / makefile.w32-in

diff --git a/doc/lispintro/makefile.w32-in b/doc/lispintro/makefile.w32-in
index eb78946e4db1ee9a047049bccf6bc3b0ea5a3dc8..377112a80d2ae76cfdbfa71fcad01bd0b02e6e2a 100644 (file)
--- a/doc/lispintro/makefile.w32-in
+++ b/doc/lispintro/makefile.w32-in
@@ -1,7 +1,6 @@
 #### -*- Makefile -*- for the Emacs Lisp Introduction manual.
 
-# Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008
-#   Free Software Foundation, Inc.
+# Copyright (C) 2003-2013 Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
 
@@ -22,19 +21,24 @@
 srcdir = .
 
 infodir = $(srcdir)/../../info
+# Directory with the (customized) texinfo.tex file.
+texinfodir = $(srcdir)/../misc
 
-INFO_SOURCES = $(srcdir)/emacs-lisp-intro.texi
+INFO_EXT=.info
+INFO_OPTS=--no-split
+INFO_SOURCES = $(srcdir)/emacs-lisp-intro.texi $(srcdir)/doclicense.texi
 # The file name eintr must fit within 5 characters, to allow for
 # -NN extensions to fit into DOS 8+3 limits without clashing
-INFO_TARGETS = $(infodir)/eintr
+INFO_TARGETS = $(infodir)/eintr$(INFO_EXT)
 DVI_TARGETS = emacs-lisp-intro.dvi
 
 MAKEINFO = makeinfo
 INSTALL_INFO = install-info
 TEXI2DVI = texi2dvi
+TEXI2PDF = texi2pdf
 DVIPS = dvips
 ENVADD = $(srcdir)\..\..\nt\envadd.bat "TEXINPUTS=$(srcdir);$(TEXINPUTS)" \
-        "MAKEINFO=$(MAKEINFO) -I$(srcdir)" /C
+        "MAKEINFO=$(MAKEINFO) -I$(srcdir) -I$(texinfodir)" /C
 
 .SUFFIXES: .dvi .ps .texi
 
@@ -45,12 +49,15 @@ $(infodir)/dir:
 
 dvi: $(DVI_TARGETS)
 
-$(infodir)/eintr: $(INFO_SOURCES)
-       $(MAKEINFO) -o $@ $(srcdir)/emacs-lisp-intro.texi
+$(infodir)/eintr$(INFO_EXT): $(INFO_SOURCES)
+       $(MAKEINFO) $(INFO_OPTS) -o $@ $(srcdir)/emacs-lisp-intro.texi
 
 emacs-lisp-intro.dvi: $(INFO_SOURCES)
        $(ENVADD) $(TEXI2DVI) $(srcdir)/emacs-lisp-intro.texi
 
+emacs-lisp-intro.pdf: $(INFO_SOURCES)
+       $(ENVADD) $(TEXI2PDF) $(srcdir)/emacs-lisp-intro.texi
+
 emacs-lisp-intro.html: $(INFO_SOURCES)
        $(MAKEINFO) --html -o $@ $(srcdir)/emacs-lisp-intro.texi
 
@@ -61,7 +68,7 @@ mostlyclean:
        - $(DEL) *.log *.cp *.fn *.ky *.pg *.vr *.tp
 
 clean: mostlyclean
-       - $(DEL) *.dvi $(infodir)/eintr*
+       - $(DEL) *.dvi $(infodir)/eintr$(INFO_EXT)*
 
 distclean: clean
        - $(DEL) makefile