X-Git-Url: http://git.hcoop.net/bpt/emacs.git/blobdiff_plain/8a944cea15e463be72e7c0be513a902aafc0e99a..b6bd159922608fa474026837771d63bf7eadcf97:/doc/lispref/Makefile.in

diff --git a/doc/lispref/Makefile.in b/doc/lispref/Makefile.in
index 90b95820ed..75fa884224 100644
--- a/doc/lispref/Makefile.in
+++ b/doc/lispref/Makefile.in
@@ -1,8 +1,6 @@
 # Makefile for the GNU Emacs Lisp Reference Manual.
 
-# Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000,
-#   2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
-#   Free Software Foundation, Inc.
+# Copyright (C) 1990-1996, 1998-2011  Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
 
@@ -24,20 +22,28 @@ SHELL = /bin/sh
 # Standard configure variables.
 srcdir = @srcdir@
 
-# Tell make where to find source files; this is needed for the makefiles.
-VPATH=@srcdir@
+version=@version@
 
-infodir = ../../info
+infodir = $(srcdir)/../../info
 # Directory with the (customized) texinfo.tex file.
 texinfodir = $(srcdir)/../misc
+# Directory with emacsver.texi.
+emacsdir =  $(srcdir)/../emacs
 
-MAKEINFO = makeinfo --force
+MAKEINFO = @MAKEINFO@
+MAKEINFO_OPTS = --force --enable-encoding -I $(emacsdir) -I $(srcdir)
 TEXI2DVI = texi2dvi
 TEXI2PDF = texi2pdf
+DVIPS = dvips
+
+ENVADD = TEXINPUTS="$(srcdir):$(texinfodir):$(TEXINPUTS)" \
+         MAKEINFO="$(MAKEINFO) $(MAKEINFO_OPTS)"
 
 # List of all the texinfo files in the manual:
 
 srcs = \
+  $(srcdir)/elisp.texi \
+  $(emacsdir)/emacsver.texi \
   $(srcdir)/abbrevs.texi \
   $(srcdir)/advice.texi \
   $(srcdir)/anti.texi \
@@ -51,7 +57,6 @@ srcs = \
   $(srcdir)/debugging.texi \
   $(srcdir)/display.texi \
   $(srcdir)/edebug.texi \
-  $(srcdir)/elisp.texi \
   $(srcdir)/errors.texi \
   $(srcdir)/eval.texi \
   $(srcdir)/files.texi \
@@ -75,6 +80,7 @@ srcs = \
   $(srcdir)/numbers.texi \
   $(srcdir)/objects.texi \
   $(srcdir)/os.texi \
+  $(srcdir)/package.texi \
   $(srcdir)/positions.texi \
   $(srcdir)/processes.texi \
   $(srcdir)/searching.texi \
@@ -91,22 +97,31 @@ srcs = \
   $(srcdir)/gpl.texi \
   $(srcdir)/doclicense.texi
 
-# The info file is named `elisp'.
+mkinfodir = @test -d ${infodir} || mkdir ${infodir} || test -d ${infodir}
+
+.PHONY: info dvi pdf ps
+
 info: $(infodir)/elisp
 dvi: elisp.dvi
+html: elisp.html
 pdf: elisp.pdf
+ps: elisp.ps
 
-$(infodir):
-	mkdir $@ || test -d $@
-
-$(infodir)/elisp: $(infodir) $(srcs)
-	cd $(srcdir); $(MAKEINFO) -I. -I$(texinfodir) elisp.texi -o $@
+$(infodir)/elisp: $(srcs)
+	$(mkinfodir)
+	$(MAKEINFO) $(MAKEINFO_OPTS) -o $@ $<
 
 elisp.dvi: $(srcs)
-	$(TEXI2DVI) -I $(srcdir) -I $(texinfodir) $(srcdir)/elisp.texi
+	$(ENVADD) $(TEXI2DVI) $<
+
+elisp.html: $(srcs)
+	$(MAKEINFO) $(MAKEINFO_OPTS) --html -o $@ $<
+
+elisp.ps: elisp.dvi
+	$(DVIPS) -o $@ $<
 
 elisp.pdf: $(srcs)
-	$(TEXI2PDF) -I $(srcdir) -I $(texinfodir) $(srcdir)/elisp.texi
+	$(ENVADD) $(TEXI2PDF) $<
 
 .PHONY: mostlyclean clean distclean maintainer-clean infoclean
 
@@ -117,7 +132,9 @@ mostlyclean:
 	rm -f elisp[12]*
 
 clean: mostlyclean
-	rm -f elisp.dvi elisp.pdf vol[12].pdf
+	rm -f elisp.dvi elisp.pdf elisp.ps vol[12].pdf
+	rm -rf elisp.html
+	rm -f emacs-lispref-${version}.tar*
 
 distclean: clean
 
@@ -126,16 +143,21 @@ infoclean:
 
 maintainer-clean: distclean infoclean
 
+.PHONY: dist
+
 ## Note this excludes the two-volume stuff.
 dist:
-	rm -rf lispref
-	mkdir lispref
+	rm -rf emacs-lispref-${version}
+	mkdir emacs-lispref-${version}
 	cp ${srcdir}/*.texi ${texinfodir}/texinfo.tex \
-	  ${srcdir}/ChangeLog* ${srcdir}/README lispref/
-	sed -e 's/@sr[c]dir@/./' -e 's/\(texinfodir *=\).*/\1 ./' \
-	  -e 's/\(infodir *=\).*/\1 ./' -e 's/^\(clean:.*\)/\1 infoclean/' \
-	  ${srcdir}/Makefile.in > lispref/Makefile
-	tar -cf elisp-texi.tar lispref
-	rm -rf lispref
+	  $(emacsdir)/emacsver.texi ${srcdir}/ChangeLog* \
+	  ${srcdir}/README emacs-lispref-${version}/
+	sed -e 's/@sr[c]dir@/./' -e 's/^\(texinfodir *=\).*/\1 ./' \
+	  -e 's/^\(emacsdir *=\).*/\1 ./' \
+	  -e 's/^\(infodir *=\).*/\1 ./' -e 's/^\(clean:.*\)/\1 infoclean/' \
+	  -e "s/@ver[s]ion@/${version}/" \
+	  ${srcdir}/Makefile.in > emacs-lispref-${version}/Makefile
+	tar -cf emacs-lispref-${version}.tar emacs-lispref-${version}
+	rm -rf emacs-lispref-${version}
 
 ### Makefile ends here