svn commit - mysqldoc@docsrva: r3280 - in trunk: . sample-data/sakila sample-data/world

[mcbrown]

Author: mcbrown
Date: 2006-09-07 10:46:00 +0200 (Thu, 07 Sep 2006)
New Revision: 3280

Log:
Updaing Sakila/World examples with IDMAP Makefile references
Fixing main Makefile for clean/idmap



Modified:
   trunk/Makefile
   trunk/sample-data/sakila/Makefile
   trunk/sample-data/world/Makefile


Modified: trunk/Makefile
===================================================================
--- trunk/Makefile	2006-09-07 01:02:53 UTC (rev 3279)
+++ trunk/Makefile	2006-09-07 08:46:00 UTC (rev 3280)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 454 bytes

@@ -4,7 +4,7 @@
 
 SUBDIRS = administrator gui-common guibook internals migration-toolkit \
 	     ndbapi query-browser refman-4.1 refman-5.0 refman-5.1 refman-common \
-	     workbench
+	     workbench sample-data/world sample-data/sakila
 
 # Top-level Makefile
 


Modified: trunk/sample-data/sakila/Makefile
===================================================================
--- trunk/sample-data/sakila/Makefile	2006-09-07 01:02:53 UTC (rev 3279)
+++ trunk/sample-data/sakila/Makefile	2006-09-07 08:46:00 UTC (rev 3280)
Changed blocks: 2, Lines Added: 10, Lines Deleted: 1; 726 bytes

@@ -10,6 +10,15 @@
 
 DOC_LANG = en
 
+# Set IDMAP and remap variables
+
+IDMAP_LANG = $(DOC_LANG)
+IDMAP_MAIN = sakila
+
+IDMAP_URLBASE = $(IDMAP_MAIN)/$(IDMAP_LANG)
+IDMAP_REFS = . 
+IDMAP_SRCS = $(SAKILA_SRCS)
+
 # Import standard variables
 
 include $(MAKE_DIR)/vars-layout

@@ -30,7 +39,7 @@
 
 SAKILA_SRCS = $(SAKILA_SRCS_EXTRA) sakila.xml changelog.xml images/sakila-schema.png 
 
-sakila-prepped.xml = $(WORLD_SETUP_SRCS)
+sakila-prepped.xml = $(SAKILA_SRCS)
 
 clean::
 	$(RM) sakila.txt


Modified: trunk/sample-data/world/Makefile
===================================================================
--- trunk/sample-data/world/Makefile	2006-09-07 01:02:53 UTC (rev 3279)
+++ trunk/sample-data/world/Makefile	2006-09-07 08:46:00 UTC (rev 3280)
Changed blocks: 1, Lines Added: 9, Lines Deleted: 0; 518 bytes

@@ -10,6 +10,15 @@
 
 DOC_LANG = en
 
+# Set IDMAP and remap variables
+
+IDMAP_LANG = $(DOC_LANG)
+IDMAP_MAIN = world
+
+IDMAP_URLBASE = $(IDMAP_MAIN)/$(IDMAP_LANG)
+IDMAP_REFS = . 
+IDMAP_SRCS = $(WORLD_SETUP_SRCS)
+
 # Import standard variables
 
 include $(MAKE_DIR)/vars-layout