HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge from trunk
[bpt/emacs.git]
/
doc
/
lispref
/
makefile.w32-in
diff --git
a/doc/lispref/makefile.w32-in
b/doc/lispref/makefile.w32-in
index
720f91c
..
86a0de3
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.
# -*- 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, 2010
+# Free Software Foundation, Inc.
# This file is part of GNU Emacs.
# 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
# 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
# GNU Emacs is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-15,9
+16,8
@@
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
# 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 = .
# Standard configure variables.
srcdir = .
@@
-25,6
+25,9
@@
srcdir = .
infodir = $(srcdir)/../../info
usermanualdir = $(srcdir)/../emacs
infodir = $(srcdir)/../../info
usermanualdir = $(srcdir)/../emacs
+# Directory with emacsver.texi.
+emacsdir = $(srcdir)/../emacs
+
# Redefine `TEX' if `tex' does not invoke plain TeX. For example:
# TEX=platex
TEX=tex
# Redefine `TEX' if `tex' does not invoke plain TeX. For example:
# TEX=platex
TEX=tex
@@
-37,11
+40,13
@@
texinputdir = $(srcdir)\..\..\nt\envadd.bat "TEXINPUTS=$(srcdir);$(TEXINPUTS)" /
# The name of the manual:
VERSION=2.9
# 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:
srcs = \
# List of all the texinfo files in the manual:
srcs = \
+ $(emacsdir)/emacsver.texi \
$(srcdir)/abbrevs.texi \
$(srcdir)/advice.texi \
$(srcdir)/anti.texi \
$(srcdir)/abbrevs.texi \
$(srcdir)/advice.texi \
$(srcdir)/anti.texi \
@@
-106,10
+111,12
@@
$(infodir)/dir:
$(INSTALL_INFO) --info-dir=$(infodir) $(infodir)/elisp
$(infodir)/elisp: $(srcs)
$(INSTALL_INFO) --info-dir=$(infodir) $(infodir)/elisp
$(infodir)/elisp: $(srcs)
- $(MAKEINFO) -I. -I$(srcdir) -o $(infodir)/elisp $(srcdir)/elisp.texi
+ $(MAKEINFO) -I. -I$(srcdir) -I$(emacsdir) \
+ -o $(infodir)/elisp $(srcdir)/elisp.texi
elisp.dvi: $(srcs)
elisp.dvi: $(srcs)
- $(texinputdir) $(TEX) -I $(usermanualdir) $(srcdir)/elisp.texi
+ $(texinputdir) $(TEX) -I $(usermanualdir) -I$(emacsdir) \
+ $(srcdir)/elisp.texi
clean:
- $(DEL) *.toc *.aux *.log *.cp *.cps *.fn *.fns *.tp *.tps \
clean:
- $(DEL) *.toc *.aux *.log *.cp *.cps *.fn *.fns *.tp *.tps \
@@
-118,6
+125,7
@@
clean:
- $(DEL) $(infodir)/elisp*
distclean: clean
- $(DEL) $(infodir)/elisp*
distclean: clean
+ - $(DEL) makefile
maintainer-clean: distclean
- $(DEL) elisp elisp-? elisp-?? elisp.dvi elisp.oaux
maintainer-clean: distclean
- $(DEL) elisp elisp-? elisp-?? elisp.dvi elisp.oaux