(tar.dvi): Fixed TEXINPUTS value.

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 310ecfe49530abcb519dbe9f07287af47b86f768..ee3a7820bacf1f2c341116c3417dadc5bf1da375 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,24 +1,25 @@
 # Makefile for GNU tar documentation.
-# Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc.
 
-# This program 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)
-# any later version.
+# Copyright (C) 1994, 1995, 1996, 1997, 1999, 2000, 2001, 2003 Free
+# Software Foundation, Inc.
 
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+## This program 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)
+## any later version.
 
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## GNU General Public License for more details.
+
+## You should have received a copy of the GNU General Public License
+## along with this program; if not, write to the Free Software Foundation,
+## Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-AUTOMAKE_OPTIONS = gnits
 info_TEXINFOS = tar.texi
 
-EXTRA_DIST = convtexi.pl getdate.texi header.texi
+EXTRA_DIST = convtexi.pl fdl.texi freemanuals.texi getdate.texi header.texi
 
 CLEANFILES = tmp-*
 
@@ -26,16 +27,11 @@ CLEANFILES = tmp-*
 # Just call `make dvi RENDITION=PROOF' if you want PROOF rendition.
 RENDITION = DISTRIB
 
-tar.info: tar.texi getdate.texi header.texi version.texi
-       @echo "WARNING: \`makeinfo' will not preprocess Texinfo input properly"
-       @echo "         for expanding Texinfo macros, if it comes from a"
-       @echo "         Texinfo distribution which is earlier than version 3.7."
-       cd $(srcdir) && $(MAKEINFO) -D$(RENDITION) tar.texi
+$(srcdir)/tar.info: tar.texi fdl.texi freemanuals.texi getdate.texi \
+  $(srcdir)/header.texi version.texi
+       $(MAKEINFO) --no-split -D$(RENDITION) -I$(srcdir) tar.texi -o $@
 
-tar.dvi: tar.texi getdate.texi header.texi version.texi
-       @echo "WARNING: \`makeinfo' will not preprocess Texinfo input properly"
-       @echo "         for expanding Texinfo macros, if it comes from a"
-       @echo "         Texinfo distribution which is earlier than version 3.7."
+tar.dvi: tar.texi getdate.texi $(srcdir)/header.texi version.texi
        $(MAKEINFO) -D$(RENDITION) -Etmp-tar.tmp -otmp-tar.info \
          -I$(srcdir) tar.texi
        rm -f tmp-tar.sed tmp-tar.info*
@@ -45,9 +41,11 @@ tar.dvi: tar.texi getdate.texi header.texi version.texi
          || echo >>tmp-tar.sed '/^@smallbook/d'
        sed -f tmp-tar.sed tmp-tar.tmp > tmp-tar.texi
        rm -f tmp-tar.sed tmp-tar.tmp
-       TEXINPUTS=$(srcdir):$$TEXINPUTS $(TEXI2DVI) tmp-tar.texi
+       TEXINPUTS=$(top_srcdir)/config:$$TEXINPUTS \
+         MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir)' \
+         $(TEXI2DVI) tmp-tar.texi
        mv tmp-tar.dvi $@
 
-header.texi: $(top_srcdir)/src/tar.h
+$(srcdir)/header.texi: $(top_srcdir)/src/tar.h
        sed -n '/Archive Format/,/End of Format/p' $(top_srcdir)/src/tar.h \
-         | expand | sed 's/\([{}]\)/@\1/g' > $(srcdir)/header.texi
+         | expand | sed 's/\([{}]\)/@\1/g' >$@