(File Name Expansion): Clarify previous change.

[gnu-emacs] / lispref / Makefile.in

diff --git a/lispref/Makefile.in b/lispref/Makefile.in
index 770ffd5769a7a78bfec0538b2358e30841321a83..9abd45f8f1564e6bd9534913ce0b61059cc91604 100644 (file)
--- a/lispref/Makefile.in
+++ b/lispref/Makefile.in
@@ -1,7 +1,7 @@
 # Makefile for the GNU Emacs Lisp Reference Manual.
 
-# Copyright (C) 1990,1991,1992,1993,1994,1995,1996,1998,1999,2000,2001,2003,2004
-#  Free Software Foundation, Inc.
+# Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000,
+#   2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
 
@@ -17,8 +17,8 @@
 
 # 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., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
 
 # Standard configure variables.
 srcdir = @srcdir@
@@ -26,7 +26,8 @@ srcdir = @srcdir@
 # Tell make where to find source files; this is needed for the makefiles.
 VPATH=@srcdir@
 
-infodir = $(srcdir)/../info
+infodir = ../info
+usermanualdir = $(srcdir)/../man
 
 TEXI2DVI = texi2dvi
 SHELL = /bin/sh
@@ -46,7 +47,6 @@ srcs = \
   $(srcdir)/back.texi \
   $(srcdir)/backups.texi \
   $(srcdir)/buffers.texi \
-  $(srcdir)/calendar.texi \
   $(srcdir)/commands.texi \
   $(srcdir)/compile.texi \
   $(srcdir)/control.texi \
@@ -101,10 +101,10 @@ srcs = \
 info: $(infodir)/elisp
 
 $(infodir)/elisp: $(srcs)
-       $(MAKEINFO) -I. -I$(srcdir) $(srcdir)/elisp.texi -o $(infodir)/elisp
+       cd $(srcdir); $(MAKEINFO) -I. -I$(infodir) elisp.texi -o $(infodir)/elisp
 
 elisp.dvi: $(srcs)
-       $(TEXI2DVI) -I $(srcdir) $(srcdir)/elisp.texi
+       $(TEXI2DVI) -I $(srcdir) -I $(usermanualdir) $(srcdir)/elisp.texi
 
 # This is for use in a separate distro of the Emacs Lisp manual.
 install: elisp
@@ -125,7 +125,7 @@ distclean: clean
 
 maintainer-clean: clean
        rm -f elisp.dvi elisp.oaux
-       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]
 
 dist: $(infodir)/elisp elisp.dvi
        -rm -rf temp