Author: paul
Date: 2007-01-19 20:11:20 +0100 (Fri, 19 Jan 2007)
New Revision: 4580
Log:
r18479@polar: paul | 2007-01-19 12:11:00 -0600
Revise fragment file target rule to package output files in subdir.
Modified:
trunk/falcon/Makefile
trunk/make.d/fragments
trunk/refman-4.1/Makefile
trunk/refman-5.0/Makefile
trunk/refman-5.1/Makefile
trunk/refman-common/Makefile
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:18459
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:14920
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:13520
+ 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:18479
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:14920
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:13520
Modified: trunk/falcon/Makefile
===================================================================
--- trunk/falcon/Makefile 2007-01-19 19:10:31 UTC (rev 4579)
+++ trunk/falcon/Makefile 2007-01-19 19:11:20 UTC (rev 4580)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 455 bytes
@@ -72,7 +72,7 @@
include $(MAKE_DIR)/xml-help
include $(MAKE_DIR)/xml-remark
include $(MAKE_DIR)/xml-titles
-include $(MAKE_DIR)/fragment-files
+include $(MAKE_DIR)/fragments
include $(MAKE_DIR)/xml-depend
include $(MAKE_DIR)/xml-listing
Modified: trunk/make.d/fragments
===================================================================
--- trunk/make.d/fragments 2007-01-19 19:10:31 UTC (rev 4579)
+++ trunk/make.d/fragments 2007-01-19 19:11:20 UTC (rev 4580)
Changed blocks: 2, Lines Added: 9, Lines Deleted: 10; 1154 bytes
@@ -22,15 +22,14 @@
HTML_FRAGMENT_FILES = \
ReadMe.html
-fragment-files:: $(TEXT_FRAGMENT_FILES) $(HTML_FRAGMENT_FILES)
+FRAGMENT_FILES = $(TEXT_FRAGMENT_FILES) $(HTML_FRAGMENT_FILES)
-# Target to produce a list of the fragment files. (Useful
-# for commands that need to know what they are for packaging
-# them into an archive.)
+fragments:: $(FRAGMENT_FILES)
+ -$(RM) -r $@ $@-tmp
+ mkdir $@-tmp
+ cp $(FRAGMENT_FILES) $@-tmp
+ mv $@-tmp $@
-list-fragment-files::
- @echo $(TEXT_FRAGMENT_FILES) $(HTML_FRAGMENT_FILES)
-
INSTALL-SOURCE:: manual.txt $(GENERATE_TEXT_FILES)
perl -w $(GENERATE_TEXT_FILES) manual.txt \
"Installing MySQL" \
@@ -89,8 +88,8 @@
> $@
clean::
- $(RM) $(TEXT_FRAGMENT_FILES)
- $(RM) $(HTML_FRAGMENT_FILES)
+ $(RM) $(FRAGMENT_FILES)
+ $(RM) -r fragments fragments-tmp
help::
- @echo "make fragment-files - generate refman 'fragment' files"
+ @echo "make fragments - generate refman 'fragment' files"
Modified: trunk/refman-4.1/Makefile
===================================================================
--- trunk/refman-4.1/Makefile 2007-01-19 19:10:31 UTC (rev 4579)
+++ trunk/refman-4.1/Makefile 2007-01-19 19:11:20 UTC (rev 4580)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 469 bytes
@@ -105,7 +105,7 @@
include $(MAKE_DIR)/xml-help
include $(MAKE_DIR)/xml-remark
include $(MAKE_DIR)/xml-titles
-include $(MAKE_DIR)/fragment-files
+include $(MAKE_DIR)/fragments
include $(MAKE_DIR)/xml-depend
include $(MAKE_DIR)/xml-listing
Modified: trunk/refman-5.0/Makefile
===================================================================
--- trunk/refman-5.0/Makefile 2007-01-19 19:10:31 UTC (rev 4579)
+++ trunk/refman-5.0/Makefile 2007-01-19 19:11:20 UTC (rev 4580)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 469 bytes
@@ -114,7 +114,7 @@
include $(MAKE_DIR)/xml-help
include $(MAKE_DIR)/xml-remark
include $(MAKE_DIR)/xml-titles
-include $(MAKE_DIR)/fragment-files
+include $(MAKE_DIR)/fragments
include $(MAKE_DIR)/xml-depend
include $(MAKE_DIR)/xml-listing
Modified: trunk/refman-5.1/Makefile
===================================================================
--- trunk/refman-5.1/Makefile 2007-01-19 19:10:31 UTC (rev 4579)
+++ trunk/refman-5.1/Makefile 2007-01-19 19:11:20 UTC (rev 4580)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 469 bytes
@@ -112,7 +112,7 @@
include $(MAKE_DIR)/xml-help
include $(MAKE_DIR)/xml-remark
include $(MAKE_DIR)/xml-titles
-include $(MAKE_DIR)/fragment-files
+include $(MAKE_DIR)/fragments
include $(MAKE_DIR)/xml-depend
include $(MAKE_DIR)/xml-listing
Modified: trunk/refman-common/Makefile
===================================================================
--- trunk/refman-common/Makefile 2007-01-19 19:10:31 UTC (rev 4579)
+++ trunk/refman-common/Makefile 2007-01-19 19:11:20 UTC (rev 4580)
Changed blocks: 1, Lines Added: 0, Lines Deleted: 1; 445 bytes
@@ -90,6 +90,5 @@
include $(MAKE_DIR)/xml-help
include $(MAKE_DIR)/xml-remark
include $(MAKE_DIR)/xml-titles
-include $(MAKE_DIR)/fragment-files
include $(MAKE_DIR)/xml-depend
include $(MAKE_DIR)/xml-listing
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r4580 - in trunk: . falcon make.d refman-4.1 refman-5.0 refman-5.1 refman-common | paul | 19 Jan |
