List:Commits« Previous MessageNext Message »
From:paul Date:April 25 2006 2:25am
Subject:svn commit - mysqldoc@docsrva: r1925 - in trunk: . make.d
View as plain text  
Author: paul
Date: 2006-04-25 04:25:21 +0200 (Tue, 25 Apr 2006)
New Revision: 1925

Log:
 r6914@polar:  paul | 2006-04-24 21:25:26 -0500
 Better dependency checking for Texinfo conversion.


Modified:
   trunk/
   trunk/make.d/xml-prep


Property changes on: trunk
___________________________________________________________________
Name: svk:merge
   - 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:6912
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:9717
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:4590
   + 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:6914
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:9717
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:4590

Modified: trunk/make.d/xml-prep
===================================================================
--- trunk/make.d/xml-prep	2006-04-25 01:23:16 UTC (rev 1924)
+++ trunk/make.d/xml-prep	2006-04-25 02:25:21 UTC (rev 1925)
@@ -32,7 +32,10 @@
 # Otherwise, if the exclusions-texi.xml file does not exist, just
 # copy the -prepped.xml file to the -texiprepped.xml file.
 
-%-texiprepped.xml: %-prepped.xml
+# A better dependency here than $(DBK_TEXIPREP_XSL_DEPS) would be %-texi.xsl
+# but there is no guarantee the latter exists.
+
+%-texiprepped.xml: %-prepped.xml $(DBK_TEXIPREP_XSL_DEPS)
 	if [ -f exclusions-texi.xml ]; then \
 		make exclusions-texi.xsl ; \
 		$(XSLTPROC) --output $@ exclusions-texi.xsl $< ; \
@@ -40,6 +43,8 @@
 		cp $< $@ ; \
 	fi
 
+# Generate exclusion stylesheet from XML file that lists excluded elements
+
 %-texi.xsl: %-texi.xml $(DBK_TEXIPREP_XSL_DEPS)
 	$(XSLTPROC) \
 		$(DBK_TEXIPREP_XSL) $< > $@

Thread
svn commit - mysqldoc@docsrva: r1925 - in trunk: . make.dpaul25 Apr