Merge changes from emacs-23 branch

[bpt/emacs.git] / doc / lispref / Makefile.in

diff --git a/doc/lispref/Makefile.in b/doc/lispref/Makefile.in
index 245a5f9..75fa884 100644 (file)
--- 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,22 @@ 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 -I $(emacsdir)
+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:
 
@@ -80,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 \
@@ -96,24 +97,31 @@ srcs = \
   $(srcdir)/gpl.texi \
   $(srcdir)/doclicense.texi
 
-mkinfodir = @cd ${srcdir}; test -d ${infodir} || mkdir ${infodir} || test -d ${infodir}
+mkinfodir = @test -d ${infodir} || mkdir ${infodir} || test -d ${infodir}
 
-.PHONY: info dvi pdf
+.PHONY: info dvi pdf ps
 
-# The info file is named `elisp'.
 info: $(infodir)/elisp
 dvi: elisp.dvi
+html: elisp.html
 pdf: elisp.pdf
+ps: elisp.ps
 
 $(infodir)/elisp: $(srcs)
        $(mkinfodir)
-       cd $(srcdir); $(MAKEINFO) -I. -I$(texinfodir) $< -o $@
+       $(MAKEINFO) $(MAKEINFO_OPTS) -o $@ $<
 
 elisp.dvi: $(srcs)
-       $(TEXI2DVI) -I $(srcdir) -I $(texinfodir) $<
+       $(ENVADD) $(TEXI2DVI) $<
+
+elisp.html: $(srcs)
+       $(MAKEINFO) $(MAKEINFO_OPTS) --html -o $@ $<
+
+elisp.ps: elisp.dvi
+       $(DVIPS) -o $@ $<
 
 elisp.pdf: $(srcs)
-       $(TEXI2PDF) -I $(srcdir) -I $(texinfodir) $<
+       $(ENVADD) $(TEXI2PDF) $<
 
 .PHONY: mostlyclean clean distclean maintainer-clean infoclean
 
@@ -124,13 +132,14 @@ 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
 
 infoclean:
-       -cd $(srcdir) && cd $(infodir) && rm -f elisp elisp-[1-9] elisp-[1-9][0-9]
+       -cd $(infodir) && rm -f elisp elisp-[1-9] elisp-[1-9][0-9]
 
 maintainer-clean: distclean infoclean
 
@@ -141,9 +150,11 @@ dist:
        rm -rf emacs-lispref-${version}
        mkdir emacs-lispref-${version}
        cp ${srcdir}/*.texi ${texinfodir}/texinfo.tex \
-         ${srcdir}/ChangeLog* ${srcdir}/README emacs-lispref-${version}/
-       sed -e 's/@sr[c]dir@/./' -e 's/\(texinfodir *=\).*/\1 ./' \
-         -e 's/\(infodir *=\).*/\1 ./' -e 's/^\(clean:.*\)/\1 infoclean/' \
+         $(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}