From 55050f566b1fbf6a2ce3c60ddbb44d0f52d4865b Mon Sep 17 00:00:00 2001
From: chas williams - CONTRACTOR <chas@cmf.nrl.navy.mil>
Date: Wed, 8 Jun 2011 09:42:47 -0400
Subject: [PATCH] doc: fix dependencies

index.html might not be built if you are building anything other than
the html/chunk.xsl but in general this is better than before.

Change-Id: I2e1b98c8a3fce65cb702274d5e276989031e338b
Reviewed-on: http://gerrit.openafs.org/4822
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@dementia.org>
Reviewed-by: Jeffrey Altman <jaltman@openafs.org>
---
 doc/xml/AdminGuide/Makefile.in     | 13 +++++++------
 doc/xml/QuickStartUnix/Makefile.in | 14 ++++++++------
 doc/xml/UserGuide/Makefile.in      | 13 +++++++------
 3 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/doc/xml/AdminGuide/Makefile.in b/doc/xml/AdminGuide/Makefile.in
index e9ada21..cbbba59 100644
--- a/doc/xml/AdminGuide/Makefile.in
+++ b/doc/xml/AdminGuide/Makefile.in
@@ -13,28 +13,29 @@
 # HTML_XSL is possibly specific to Debian and may need to be modified on other
 # systems.
 
-all: pdf html
+BOOK = auagd000
+
+all: $(BOOK).pdf index.html
 
 include @TOP_OBJDIR@/src/config/Makefile.config
-VERSFILE=version
+VERSION=version
 include @TOP_OBJDIR@/src/config/Makefile.version
 
-BOOK     = auagd000
 SRCS     = $(BOOK).xml auagd005.xml auagd006.xml auagd007.xml auagd008.xml \
 	   auagd009.xml auagd010.xml auagd011.xml auagd012.xml auagd013.xml \
 	   auagd014.xml auagd015.xml auagd016.xml auagd017.xml auagd018.xml \
 	   auagd019.xml auagd020.xml auagd021.xml auagd022.xml auagd023.xml \
-	   auagd024.xml auagd025.xml
+	   auagd024.xml auagd025.xml $(VERSION).xml
 HTML_XSL = @HTML_XSL@
 DOCBOOK_STYLESHEETS = @DOCBOOK_STYLESHEETS@
 XSLTPROC = @XSLTPROC@
 DOCBOOK2PDF = @DOCBOOK2PDF@
 
-html: $(SRCS) $(VERSFILE).xml
+index.html: $(SRCS)
 	$(XSLTPROC) --param navig.graphics 1 \
 	    --stringparam navig.graphics.path ../ $(DOCBOOK_STYLESHEETS)/$(HTML_XSL) $(BOOK).xml
 
-pdf: $(SRCS) $(VERSFILE).xml
+$(BOOK).pdf: $(SRCS)
 	if test "x$(DOCBOOK2PDF)" = "xfop"; then \
 		$(XSLTPROC) $(DOCBOOK_STYLESHEETS)/fo/docbook.xsl $(BOOK).xml > $(BOOK).fo; \
 		$(DOCBOOK2PDF) $(BOOK).fo $(BOOK).pdf; \
diff --git a/doc/xml/QuickStartUnix/Makefile.in b/doc/xml/QuickStartUnix/Makefile.in
index 9105769..229e264 100644
--- a/doc/xml/QuickStartUnix/Makefile.in
+++ b/doc/xml/QuickStartUnix/Makefile.in
@@ -13,25 +13,27 @@
 # HTML_XSL is specific to Debian and will need to be modified on other
 # systems until we have a better mechanism for finding the correct path.
 
-all: pdf html
+BOOK = auqbg000
+
+all: $(BOOK).pdf index.html
 
 include @TOP_OBJDIR@/src/config/Makefile.config
-VERSFILE=version
+VERSION=version
 include @TOP_OBJDIR@/src/config/Makefile.version
 
-BOOK     = auqbg000
 SRCS     = $(BOOK).xml auqbg003.xml auqbg004.xml auqbg005.xml auqbg006.xml \
-	   auqbg007.xml auqbg008.xml appendix.xml appendix_dafs.xml
+	   auqbg007.xml auqbg008.xml appendix.xml appendix_dafs.xml \
+	   $(VERSION).xml
 HTML_XSL = @HTML_XSL@
 DOCBOOK_STYLESHEETS = @DOCBOOK_STYLESHEETS@
 XSLTPROC = @XSLTPROC@
 DOCBOOK2PDF = @DOCBOOK2PDF@
 
-html: $(SRCS) $(VERSFILE).xml
+index.html: $(SRCS)
 	$(XSLTPROC) --param navig.graphics 1 \
 	    --stringparam navig.graphics.path ../ $(DOCBOOK_STYLESHEETS)/$(HTML_XSL) $(BOOK).xml
 
-pdf: $(SRCS) $(VERSFILE).xml
+$(BOOK).pdf: $(SRCS)
 	if test "x$(DOCBOOK2PDF)" = "xfop"; then \
 		$(XSLTPROC) $(DOCBOOK_STYLESHEETS)/fo/docbook.xsl $(BOOK).xml > $(BOOK).fo; \
 		$(DOCBOOK2PDF) $(BOOK).fo $(BOOK).pdf; \
diff --git a/doc/xml/UserGuide/Makefile.in b/doc/xml/UserGuide/Makefile.in
index 3b899ce..725959c 100644
--- a/doc/xml/UserGuide/Makefile.in
+++ b/doc/xml/UserGuide/Makefile.in
@@ -13,26 +13,27 @@
 # HTML_XSL is possibly specific to Debian and may need to be modified on other
 # systems.
 
-all: pdf html
+BOOK = auusg000
+
+all: $(BOOK).pdf index.html
 
 include @TOP_OBJDIR@/src/config/Makefile.config
-VERSFILE=version
+VERSION=version
 include @TOP_OBJDIR@/src/config/Makefile.version
 
-BOOK     = auusg000
 SRCS     = $(BOOK).xml auusg003.xml auusg004.xml auusg005.xml auusg006.xml \
 	   auusg007.xml auusg008.xml auusg009.xml auusg010.xml auusg011.xml \
-	   auusg012.xml
+	   auusg012.xml $(VERSION).xml
 HTML_XSL = @HTML_XSL@
 DOCBOOK_STYLESHEETS = @DOCBOOK_STYLESHEETS@
 XSLTPROC = @XSLTPROC@
 DOCBOOK2PDF = @DOCBOOK2PDF@
 
-html: $(SRCS) $(VERSFILE).xml
+index.html: $(SRCS)
 	$(XSLTPROC) --param navig.graphics 1 \
 	    --stringparam navig.graphics.path ../ $(DOCBOOK_STYLESHEETS)/$(HTML_XSL) $(BOOK).xml
 
-pdf: $(SRCS) $(VERSFILE).xml
+$(BOOK).pdf: $(SRCS)
 	if test "x$(DOCBOOK2PDF)" = "xfop"; then \
 		$(XSLTPROC) $(DOCBOOK_STYLESHEETS)/fo/docbook.xsl $(BOOK).xml > $(BOOK).fo; \
 		$(DOCBOOK2PDF) $(BOOK).fo $(BOOK).pdf; \
-- 
1.9.4