From: Eli Zaretskii <eliz@gnu.org>
Date: Fri, 16 Nov 2001 12:42:29 +0000 (+0000)
Subject: (infodir): Define relative to $(srcdir).
X-Git-Tag: ttn-vms-21-2-B4~18514
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=4eeb568b5d9db09efbd13b7360a453a3b991b719;p=emacs.git

(infodir): Define relative to $(srcdir).
($(infodir)/elisp): Don't chdir into $(srcdir), but add it to the
include directories list via -I switch to makeinfo.
(index.texi): Use cp if both hard and symbolic links fail.
---

diff --git a/lispref/Makefile.in b/lispref/Makefile.in
index 45ef705d110..71605c4b65b 100644
--- a/lispref/Makefile.in
+++ b/lispref/Makefile.in
@@ -26,7 +26,7 @@ srcdir = @srcdir@
 # Tell make where to find source files; this is needed for the makefiles.
 VPATH=@srcdir@
 
-infodir = ../info
+infodir = $(srcdir)/../info
 
 # Redefine `TEX' if `tex' does not invoke plain TeX.  For example:
 # TEX=platex
@@ -111,7 +111,7 @@ srcs = \
 info: $(infodir)/elisp
 
 $(infodir)/elisp: $(srcs) index.texi
-	cd $(srcdir); $(MAKEINFO) -I. elisp.texi -o $(infodir)/elisp
+	$(MAKEINFO) -I. -I$(srcdir) $(srcdir)/elisp.texi -o $(infodir)/elisp
 
 elisp.dvi: $(srcs) index.texi
 	# Avoid losing old contents of aux file entirely.
@@ -131,9 +131,9 @@ elisp.dvi: $(srcs) index.texi
 index.texi:
 	if [ a${permuted_index} != a ]; \
 	then \
-	  ln -s $(srcdir)/index.perm index.texi || ln $(srcdir)/index.perm index.texi; \
+	  ln -s $(srcdir)/index.perm index.texi || ln $(srcdir)/index.perm index.texi || cp $(srcdir)/index.perm index.texi; \
 	else \
-	  ln -s $(srcdir)/index.unperm index.texi || ln $(srcdir)/index.unperm index.texi; \
+	  ln -s $(srcdir)/index.unperm index.texi || ln $(srcdir)/index.unperm index.texi || cp $(srcdir)/index.unperm index.texi; \
 	fi
 
 install: elisp