(Fw32_registered_hot_keys): Don't return the nil values corresponding

[gnu-emacs] / lispintro / makefile.w32-in

diff --git a/lispintro/makefile.w32-in b/lispintro/makefile.w32-in
index c0ab93432e38e8b89a63e16d574eeb3ddf6777a9..07d51d2462010734a39a9379fdd1bf15fd39d799 100644 (file)
--- a/lispintro/makefile.w32-in
+++ b/lispintro/makefile.w32-in
@@ -1,12 +1,12 @@
 #### -*- Makefile -*- for the Emacs Lisp Introduction manual.
 
-# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
 
 # 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 2, or (at your option)
+# the Free Software Foundation; either version 3, or (at your option)
 # any later version.
 
 # GNU Emacs is distributed in the hope that it will be useful,
@@ -21,7 +21,7 @@
 
 srcdir = .
 
-infodir = ../info
+infodir = $(srcdir)/../info
 
 INFO_SOURCES = $(srcdir)/emacs-lisp-intro.texi
 # The file name eintr must fit within 5 characters, to allow for
@@ -46,7 +46,7 @@ $(infodir)/dir:
 dvi: $(DVI_TARGETS)
 
 $(infodir)/eintr: $(INFO_SOURCES)
-       cd $(srcdir); $(MAKEINFO) emacs-lisp-intro.texi -o $(infodir)/eintr
+       $(MAKEINFO) -o $@ $(srcdir)/emacs-lisp-intro.texi
 
 emacs-lisp-intro.dvi: $(INFO_SOURCES)
        $(ENVADD) $(TEXI2DVI) $(srcdir)/emacs-lisp-intro.texi