(All info targets): Specify $(srcdir) in input files. Specify -I option.

(All dvi targets): Set the TEXINPUTS variable.

1 files changed, 29 insertions, 24 deletions

diff --git a/man/Makefile.in b/man/Makefile.in
index 0488fea88bd..b711aefca7e 100644
--- a/man/Makefile.in
+++ b/man/Makefile.in
@@ -69,70 +69,75 @@ info: $(INFO_TARGETS)
 
 dvi: $(DVI_TARGETS)
 
+# Note that all the Info targets build the Info files
+# in srcdir.  There is no provision for Info files
+# to exist in the build directory.
+# In a distribution of Emacs, the Info files should be up to date.
+
 ../info/info: ${INFOSOURCES}
-	$(MAKEINFO) --no-split info.texi
+	$(MAKEINFO) --no-split -I$(srcdir) $(srcdir)/info.texi
 
 info.dvi: ${INFOSOURCES}
-	$(TEXI2DVI) ${srcdir}/info.texi
+	TEXINPUTS="$(srcdir) $(TEXINPUTS)"; $(TEXI2DVI) ${srcdir}/info.texi
 
 ../info/emacs: ${EMACSSOURCES}
-	$(MAKEINFO) emacs.texi
+	$(MAKEINFO) -I$(srcdir) $(srcdir)/emacs.texi
 
 emacs.dvi: ${EMACSSOURCES}
-	$(TEXI2DVI) ${srcdir}/emacs.texi
+	TEXINPUTS="$(srcdir) $(TEXINPUTS)"; $(TEXI2DVI) ${srcdir}/emacs.texi
 
 ../info/ccmode: cc-mode.texi
-	$(MAKEINFO) cc-mode.texi
+	$(MAKEINFO) -I$(srcdir) $(srcdir)/cc-mode.texi
 cc-mode.dvi: cc-mode.texi
-	$(TEXI2DVI) ${srcdir}/cc-mode.texi
+	TEXINPUTS="$(srcdir) $(TEXINPUTS)"; $(TEXI2DVI) ${srcdir}/cc-mode.texi
 
 ../info/cl: cl.texi
-	$(MAKEINFO) cl.texi
+	$(MAKEINFO) -I$(srcdir) $(srcdir)/cl.texi
 cl.dvi: cl.texi
-	$(TEXI2DVI) ${srcdir}/cl.texi
+	TEXINPUTS="$(srcdir) $(TEXINPUTS)"; $(TEXI2DVI) ${srcdir}/cl.texi
 
 ../info/dired-x: dired-x.texi
-	$(MAKEINFO) dired-x.texi
+	$(MAKEINFO) -I$(srcdir) $(srcdir)/dired-x.texi
 dired-x.dvi: dired-x.texi
-	$(TEXI2DVI) ${srcdir}/dired-x.texi
+	TEXINPUTS="$(srcdir) $(TEXINPUTS)"; $(TEXI2DVI) ${srcdir}/dired-x.texi
 
 ../info/ediff: ediff.texi
-	$(MAKEINFO) ediff.texi
+	$(MAKEINFO) -I$(srcdir) $(srcdir)/ediff.texi
 ediff.dvi: ediff.texi
-	$(TEXI2DVI) ${srcdir}/ediff.texi
+	TEXINPUTS="$(srcdir) $(TEXINPUTS)"; $(TEXI2DVI) ${srcdir}/ediff.texi
 
 ../info/forms: forms.texi
-	$(MAKEINFO) forms.texi
+	$(MAKEINFO) -I$(srcdir) $(srcdir)/forms.texi
 forms.dvi: forms.texi
-	$(TEXI2DVI) ${srcdir}/forms.texi
+	TEXINPUTS="$(srcdir) $(TEXINPUTS)"; $(TEXI2DVI) ${srcdir}/forms.texi
 
 ../info/mh-e: mh-e.texi
-	$(MAKEINFO) mh-e.texi
+	$(MAKEINFO) -I$(srcdir) $(srcdir)/mh-e.texi
 mh-e.dvi: mh-e.texi
-	$(TEXI2DVI) ${srcdir}/mh-e.texi
+	TEXINPUTS="$(srcdir) $(TEXINPUTS)"; $(TEXI2DVI) ${srcdir}/mh-e.texi
 
 ../info/sc: sc.texi
-	$(MAKEINFO) sc.texi
+	$(MAKEINFO) -I$(srcdir) $(srcdir)/sc.texi
 sc.dvi: sc.texi
-	$(TEXI2DVI) ${srcdir}/sc.texi
+	TEXINPUTS="$(srcdir) $(TEXINPUTS)"; $(TEXI2DVI) ${srcdir}/sc.texi
 
 ../info/vip: vip.texi
-	$(MAKEINFO) vip.texi
+	$(MAKEINFO) -I$(srcdir) $(srcdir)/vip.texi
 vip.dvi: vip.texi
-	$(TEXI2DVI) ${srcdir}/vip.texi
+	TEXINPUTS="$(srcdir) $(TEXINPUTS)"; $(TEXI2DVI) ${srcdir}/vip.texi
 
 ../info/gnus: gnus.texi
-	$(MAKEINFO) gnus.texi
+	$(MAKEINFO) -I$(srcdir) $(srcdir)/gnus.texi
 gnus.dvi: gnus.texi
-	$(TEXI2DVI) ${srcdir}/gnus.texi
+	TEXINPUTS="$(srcdir) $(TEXINPUTS)"; $(TEXI2DVI) ${srcdir}/gnus.texi
 
 ../etc/GNU: gnu1.texi gnu.texi
 	makeinfo --no-headers -o ../etc/GNU gnu1.texi
 
 ../info/viper: viper.texi viper-cmd.texi
-	$(MAKEINFO) viper.texi
+	$(MAKEINFO) -I$(srcdir) $(srcdir)/viper.texi
 viper.dvi: viper.texi viper-cmd.texi
-	$(TEXI2DVI) ${srcdir}/viper.texi
+	TEXINPUTS="$(srcdir) $(TEXINPUTS)"; $(TEXI2DVI) ${srcdir}/viper.texi
 
 mostlyclean:
 	rm -f *.log *.cp *.fn *.ky *.pg *.vr core