X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=doc%2FMakefile.am;h=232d2ea3935cfbcc9d90b18e1fd5fd83de6d855c;hb=b0d5935cb0bf058cd2fc286a48cfd6b6a1c098bf;hp=4c8d4482e9ce508ae7c322b69a96851e0c664577;hpb=b88672481836083d67d1cbaabd0e5bd491f701dd;p=chaz%2Ftar

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 4c8d448..232d2ea 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,11 +1,11 @@
 # Makefile for GNU tar documentation.
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1999, 2000, 2001, 2003, 2006 Free
-# Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1999, 2000, 2001, 2003, 2006,
+# 2007 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)
+## the Free Software Foundation; either version 3, or (at your option)
 ## any later version.
 
 ## This program is distributed in the hope that it will be useful,
@@ -20,17 +20,18 @@
 info_TEXINFOS = tar.texi
 tar_TEXINFOS = \
  dumpdir.texi\
+ tar-snapshot-edit.texi\
  fdl.texi\
  freemanuals.texi\
  genfile.texi\
  getdate.texi\
- intern.texi\
  header.texi\
+ intern.texi\
  rendition.texi\
  snapshot.texi\
+ sparse.texi\
  value.texi
 EXTRA_DIST = gendocs_template mastermenu.el texify.sed
-DISTCLEANFILES=*.info* 
 
 # The rendering level is anyone of PUBLISH, DISTRIB or PROOF.
 # Just call `make RENDITION=PROOF [target]' if you want PROOF rendition.
@@ -50,8 +51,10 @@ check-options:
 doc-opt-col=0,opt-doc-col=0,header-col=0,rmargin=1' \
 	$(top_builddir)/src/tar --usage | \
 	sed -n 's/^\[--\([^]\=\[]*\).*/\1/p' | sort | uniq > opts.$$$$;\
-	sed -n 's/@opindex *\([^,]*\)$$/\1/p;s/@opindex *\(.*\),.*/\1/p' \
-	    $(info_TEXINFOS) | sort | uniq > docs.$$$$;\
+	$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) -E - \
+            $(info_TEXINFOS) | \
+	sed -n '/^@macro/,/^@end macro/d;s/@opindex *\([^@,]*\).*/\1/p' \
+	     | sort | uniq > docs.$$$$;\
 	(echo 'Not documented options:';\
 	 join -v1 opts.$$$$ docs.$$$$;\
 	 echo 'Non-existing options:';\
@@ -76,7 +79,7 @@ TEXI2DVI=texi2dvi -t '@set $(RENDITION)' -E
 # Usual value is:
 # /usr/share/texmf/pdftex/plain/misc:/usr/share/texmf/pdftex/config
 manual:
-	TEXINPUTS=$(srcdir):$(top_srcdir)/config:$(TEXINPUTS) \
+	TEXINPUTS=$(srcdir):$(top_srcdir)/build-tex:$(TEXINPUTS) \
 	 MAKEINFO="$(MAKEINFO) $(MAKEINFOFLAGS)" \
 	 TEXI2DVI="$(TEXI2DVI) -t @finalout" \
 	$(GENDOCS) tar 'GNU tar manual'