* frames.texi (Frames): Clean up introduction. Document `ns'

[bpt/emacs.git] / doc / lispref / makefile.w32-in

diff --git a/doc/lispref/makefile.w32-in b/doc/lispref/makefile.w32-in
index 7e35339..1ba8e1e 100644 (file)
--- a/doc/lispref/makefile.w32-in
+++ b/doc/lispref/makefile.w32-in
@@ -1,13 +1,14 @@
 # -*- Makefile -*- for the GNU Emacs Lisp Reference Manual.
 
-# Copyright (C) 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009
+#   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 +16,14 @@
 # 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/>.
+
 
 # Standard configure variables.
 srcdir = .
 
-infodir = $(srcdir)/../info
-usermanualdir = $(srcdir)/../man
+infodir = $(srcdir)/../../info
+usermanualdir = $(srcdir)/../emacs
 
 # Redefine `TEX' if `tex' does not invoke plain TeX.  For example:
 # TEX=platex
@@ -33,11 +33,12 @@ MAKEINFO = makeinfo --force
 
 # The environment variable and its value to add $(srcdir) to the path
 # searched for TeX input files.
-texinputdir = $(srcdir)\..\nt\envadd.bat "TEXINPUTS=$(srcdir);$(TEXINPUTS)" /C
+texinputdir = $(srcdir)\..\..\nt\envadd.bat "TEXINPUTS=$(srcdir);$(TEXINPUTS)" /C
 
 # The name of the manual:
 VERSION=2.9
-manual = elisp-manual-21-$(VERSION)
+## FIXME can this be set by configure, as per Makefile.in?
+manual = elisp-manual-23-$(VERSION)
 
 # List of all the texinfo files in the manual:
 
@@ -118,6 +119,7 @@ clean:
        - $(DEL) $(infodir)/elisp*
 
 distclean: clean
+       - $(DEL) makefile
 
 maintainer-clean: distclean
        - $(DEL) elisp elisp-? elisp-?? elisp.dvi elisp.oaux