svn commit - mysqldoc@docsrva: r6710 - in trunk: . make.d

[paul]

Author: paul
Date: 2007-06-08 07:47:18 +0200 (Fri, 08 Jun 2007)
New Revision: 6710

Log:
 r21250@frost:  paul | 2007-06-08 00:44:35 -0500
 Add target rule for pulling externally built CHM files into
 document directories.  This is a subterfuge that will help
 us to "inject" CHM files into the build system so that it
 can store them in the staging tree and subject new files
 to comparison with old ones for quarantining purposes.


Modified:
   trunk/make.d/xml-chm

Property changes on: trunk
___________________________________________________________________
Name: svk:merge
   - 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:26025
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:21119
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:17792
   + 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:26025
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:21250
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:17792


Modified: trunk/make.d/xml-chm
===================================================================
--- trunk/make.d/xml-chm	2007-06-07 19:27:19 UTC (rev 6709)
+++ trunk/make.d/xml-chm	2007-06-08 05:47:18 UTC (rev 6710)
Changed blocks: 2, Lines Added: 23, Lines Deleted: 1; 1264 bytes

@@ -1,4 +1,4 @@
-# DocBook -> CHM-input conversions
+# DocBook -> CHM-input conversion and CHM-output pickup
 
 # Prepare CHM input that's ready to be copied to a Windows box and
 # used to produce a CHM document.

@@ -22,8 +22,30 @@
 	fi
 	mv $@-tmp $@
 
+# Grab CHM document and copy to current directory.
+
+# This rule is based on the assumption that CHM documents are built
+# by an external process and deposited into the directory specified
+# by CHM_OUTPUT_DIR.  That variable should be set in your environment
+# to be picked up and used by make.
+
+# If this rule is executed on a host where CHM files are not available
+# as just described, leave CHM_OUTPUT_DIR unset.
+
+%.chm:
+	set -e; \
+	if [ "x$(CHM_OUTPUT_DIR)" != "x" ]; then \
+		cp $(CHM_OUTPUT_DIR)/$@ $@-tmp; \
+	else \
+		echo "$@ not found"; \
+		exit 1; \
+	fi
+	mv $@-tmp $@
+
 clean::
 	$(RM) -r *.chm-input *.chm-input-tmp
+	$(RM) -r *.chm *.chm-tmp
 
 help::
 	@echo "make file.chm-input       - prepare input for Windows CHM build"
+	@echo "make file.chm             - pick up externally built CHM output"