More small edits for doc/lispref

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

diff --git a/doc/lispintro/makefile.w32-in b/doc/lispintro/makefile.w32-in
index 8d22c821ac2ec7b12457bbd5507b38b7ba6b070e..a8aaf43096e51cdb1333fab855d405c9f74fd423 100644 (file)
--- a/doc/lispintro/makefile.w32-in
+++ b/doc/lispintro/makefile.w32-in
@@ -1,13 +1,13 @@
 #### -*- Makefile -*- for the Emacs Lisp Introduction manual.
 
-# Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# Copyright (C) 2003-2012  Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
 
-# GNU Emacs is free software; you can redistribute it and/or modify
+# GNU Emacs is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3, or (at your option)
-# any later version.
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
 
 # GNU Emacs is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,15 +15,16 @@
 # GNU General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with GNU Emacs; see the file COPYING.  If not, write to
-# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-# Boston, MA 02110-1301, USA.
+# along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+
 
 srcdir = .
 
 infodir = $(srcdir)/../../info
+# Directory with the (customized) texinfo.tex file.
+texinfodir = $(srcdir)/../misc
 
-INFO_SOURCES = $(srcdir)/emacs-lisp-intro.texi
+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
@@ -32,9 +33,10 @@ 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
 
@@ -51,6 +53,9 @@ $(infodir)/eintr: $(INFO_SOURCES)
 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
 
@@ -64,6 +69,7 @@ clean: mostlyclean
        - $(DEL) *.dvi $(infodir)/eintr*
 
 distclean: clean
+       - $(DEL) makefile
 
 maintainer-clean: distclean
        - $(DEL) *.aux *.cps *.fns *.kys *.pgs *.vrs *.toc