Author: paul
Date: 2007-04-06 22:00:02 +0200 (Fri, 06 Apr 2007)
New Revision: 5767
Log:
r18809@frost: paul | 2007-04-06 14:53:39 -0500
Parameterize some paths
Modified:
trunk/administrator-ro/Makefile.ext
trunk/administrator/Makefile.ext
trunk/falcon/Makefile.ext
trunk/gui-common-cy/Makefile.ext
trunk/gui-common-ro/Makefile.ext
trunk/gui-common/Makefile.ext
trunk/internals/Makefile.ext
trunk/migration-toolkit/Makefile.ext
trunk/mysqltest/Makefile
trunk/query-browser-cy/Makefile.ext
trunk/query-browser/Makefile.ext
trunk/refman-5.0/Makefile.ext
trunk/refman-5.1/Makefile.ext
trunk/refman-common/Makefile.ext
trunk/workbench/Makefile.ext
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:22987
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:18697
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:14593
+ 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:22987
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:18809
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:14593
Modified: trunk/administrator/Makefile.ext
===================================================================
--- trunk/administrator/Makefile.ext 2007-04-06 18:09:36 UTC (rev 5766)
+++ trunk/administrator/Makefile.ext 2007-04-06 20:00:02 UTC (rev 5767)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 542 bytes
@@ -1,5 +1,5 @@
# Makefile extensions for operations specific to this directory
-../administrator/metadata/%.idmap: ../administrator/%.xml
- make -C ../administrator idmap
+$(REPO_ROOT)/administrator/metadata/%.idmap: $(REPO_ROOT)/administrator/%.xml
+ make -C $(REPO_ROOT)/administrator idmap
Modified: trunk/administrator-ro/Makefile.ext
===================================================================
--- trunk/administrator-ro/Makefile.ext 2007-04-06 18:09:36 UTC (rev 5766)
+++ trunk/administrator-ro/Makefile.ext 2007-04-06 20:00:02 UTC (rev 5767)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 569 bytes
@@ -1,5 +1,5 @@
# Makefile extensions for operations specific to this directory
-../administrator-ro/metadata/%.idmap: ../administrator-ro/%.xml
- make -C ../administrator-ro idmap
+$(REPO_ROOT)/administrator-ro/metadata/%.idmap: $(REPO_ROOT)/administrator-ro/%.xml
+ make -C $(REPO_ROOT)/administrator-ro idmap
Modified: trunk/falcon/Makefile.ext
===================================================================
--- trunk/falcon/Makefile.ext 2007-04-06 18:09:36 UTC (rev 5766)
+++ trunk/falcon/Makefile.ext 2007-04-06 20:00:02 UTC (rev 5767)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 478 bytes
@@ -1,4 +1,4 @@
# Makefile extensions for operations specific to this directory
-../falcon/metadata/%.idmap: ../falcon/%.xml
- make -C ../falcon idmap
+$(REPO_ROOT)/falcon/metadata/%.idmap: $(REPO_ROOT)/falcon/%.xml
+ make -C $(REPO_ROOT)/falcon idmap
Modified: trunk/gui-common/Makefile.ext
===================================================================
--- trunk/gui-common/Makefile.ext 2007-04-06 18:09:36 UTC (rev 5766)
+++ trunk/gui-common/Makefile.ext 2007-04-06 20:00:02 UTC (rev 5767)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 515 bytes
@@ -1,5 +1,5 @@
# Makefile extensions for operations specific to this directory
-../gui-common/metadata/%.idmap: ../gui-common/%.xml
- make -C ../gui-common idmap
+$(REPO_ROOT)/gui-common/metadata/%.idmap: $(REPO_ROOT)/gui-common/%.xml
+ make -C $(REPO_ROOT)/gui-common idmap
Modified: trunk/gui-common-cy/Makefile.ext
===================================================================
--- trunk/gui-common-cy/Makefile.ext 2007-04-06 18:09:36 UTC (rev 5766)
+++ trunk/gui-common-cy/Makefile.ext 2007-04-06 20:00:02 UTC (rev 5767)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 524 bytes
@@ -1,5 +1,5 @@
# Makefile extensions for operations specific to this directory
-../gui-common/metadata/%.idmap: ../gui-common/%.xml
- make -C ../gui-common idmap
+$(REPO_ROOT)/gui-common/metadata/%.idmap: $(REPO_ROOT)/gui-common/%.xml
+ make -C $(REPO_ROOT)/gui-common idmap
Modified: trunk/gui-common-ro/Makefile.ext
===================================================================
--- trunk/gui-common-ro/Makefile.ext 2007-04-06 18:09:36 UTC (rev 5766)
+++ trunk/gui-common-ro/Makefile.ext 2007-04-06 20:00:02 UTC (rev 5767)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 542 bytes
@@ -1,5 +1,5 @@
# Makefile extensions for operations specific to this directory
-../gui-common-ro/metadata/%.idmap: ../gui-common-ro/%.xml
- make -C ../gui-common-ro idmap
+$(REPO_ROOT)/gui-common-ro/metadata/%.idmap: $(REPO_ROOT)/gui-common-ro/%.xml
+ make -C $(REPO_ROOT)/gui-common-ro idmap
Modified: trunk/internals/Makefile.ext
===================================================================
--- trunk/internals/Makefile.ext 2007-04-06 18:09:36 UTC (rev 5766)
+++ trunk/internals/Makefile.ext 2007-04-06 20:00:02 UTC (rev 5767)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 505 bytes
@@ -1,4 +1,4 @@
# Makefile extensions for operations specific to this directory
-../internals/metadata/%.idmap: ../internals/%.xml
- make -C ../internals idmap
+$(REPO_ROOT)/internals/metadata/%.idmap: $(REPO_ROOT)/internals/%.xml
+ make -C $(REPO_ROOT)/internals idmap
Modified: trunk/migration-toolkit/Makefile.ext
===================================================================
--- trunk/migration-toolkit/Makefile.ext 2007-04-06 18:09:36 UTC (rev 5766)
+++ trunk/migration-toolkit/Makefile.ext 2007-04-06 20:00:02 UTC (rev 5767)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 578 bytes
@@ -1,5 +1,5 @@
# Makefile extensions for operations specific to this directory
-../migration-toolkit/metadata/%.idmap: ../migration-toolkit/%.xml
- make -C ../migration-toolkit idmap
+$(REPO_ROOT)/migration-toolkit/metadata/%.idmap: $(REPO_ROOT)/migration-toolkit/%.xml
+ make -C $(REPO_ROOT)/migration-toolkit idmap
Modified: trunk/mysqltest/Makefile
===================================================================
--- trunk/mysqltest/Makefile 2007-04-06 18:09:36 UTC (rev 5766)
+++ trunk/mysqltest/Makefile 2007-04-06 20:00:02 UTC (rev 5767)
Changed blocks: 1, Lines Added: 4, Lines Deleted: 0; 420 bytes
@@ -81,3 +81,7 @@
include $(MAKE_DIR)/xml-man
include $(MAKE_DIR)/xml-remark
include $(MAKE_DIR)/xml-depend
+
+# Import directory specific extensions
+
+include $(REPO_ROOT)/refman-5.1/Makefile.ext
Modified: trunk/query-browser/Makefile.ext
===================================================================
--- trunk/query-browser/Makefile.ext 2007-04-06 18:09:36 UTC (rev 5766)
+++ trunk/query-browser/Makefile.ext 2007-04-06 20:00:02 UTC (rev 5767)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 541 bytes
@@ -1,4 +1,4 @@
# Makefile extensions for operations specific to this directory
-../query-browser/metadata/%.idmap: ../query-browser/%.xml
- make -C ../query-browser idmap
+$(REPO_ROOT)/query-browser/metadata/%.idmap: $(REPO_ROOT)/query-browser/%.xml
+ make -C $(REPO_ROOT)/query-browser idmap
Modified: trunk/query-browser-cy/Makefile.ext
===================================================================
--- trunk/query-browser-cy/Makefile.ext 2007-04-06 18:09:36 UTC (rev 5766)
+++ trunk/query-browser-cy/Makefile.ext 2007-04-06 20:00:02 UTC (rev 5767)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 550 bytes
@@ -1,4 +1,4 @@
# Makefile extensions for operations specific to this directory
-../query-browser/metadata/%.idmap: ../query-browser/%.xml
- make -C ../query-browser idmap
+$(REPO_ROOT)/query-browser/metadata/%.idmap: $(REPO_ROOT)/query-browser/%.xml
+ make -C $(REPO_ROOT)/query-browser idmap
Modified: trunk/refman-5.0/Makefile.ext
===================================================================
--- trunk/refman-5.0/Makefile.ext 2007-04-06 18:09:36 UTC (rev 5766)
+++ trunk/refman-5.0/Makefile.ext 2007-04-06 20:00:02 UTC (rev 5767)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 514 bytes
@@ -1,4 +1,4 @@
# Makefile extensions for operations specific to this directory
-../refman-5.0/metadata/%.idmap: ../refman-5.0/%.xml
- make -C ../refman-5.0 idmap
+$(REPO_ROOT)/refman-5.0/metadata/%.idmap: $(REPO_ROOT)/refman-5.0/%.xml
+ make -C $(REPO_ROOT)/refman-5.0 idmap
Modified: trunk/refman-5.1/Makefile.ext
===================================================================
--- trunk/refman-5.1/Makefile.ext 2007-04-06 18:09:36 UTC (rev 5766)
+++ trunk/refman-5.1/Makefile.ext 2007-04-06 20:00:02 UTC (rev 5767)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 514 bytes
@@ -1,4 +1,4 @@
# Makefile extensions for operations specific to this directory
-../refman-5.1/metadata/%.idmap: ../refman-5.1/%.xml
- make -C ../refman-5.1 idmap
+$(REPO_ROOT)/refman-5.1/metadata/%.idmap: $(REPO_ROOT)/refman-5.1/%.xml
+ make -C $(REPO_ROOT)/refman-5.1 idmap
Modified: trunk/refman-common/Makefile.ext
===================================================================
--- trunk/refman-common/Makefile.ext 2007-04-06 18:09:36 UTC (rev 5766)
+++ trunk/refman-common/Makefile.ext 2007-04-06 20:00:02 UTC (rev 5767)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 542 bytes
@@ -1,5 +1,5 @@
# Makefile extensions for operations specific to this directory
-../refman-common/metadata/%.idmap: ../refman-common/%.xml
- make -C ../refman-common idmap
+$(REPO_ROOT)/refman-common/metadata/%.idmap: $(REPO_ROOT)/refman-common/%.xml
+ make -C $(REPO_ROOT)/refman-common idmap
Modified: trunk/workbench/Makefile.ext
===================================================================
--- trunk/workbench/Makefile.ext 2007-04-06 18:09:36 UTC (rev 5766)
+++ trunk/workbench/Makefile.ext 2007-04-06 20:00:02 UTC (rev 5767)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 507 bytes
@@ -1,6 +1,6 @@
# Makefile extensions for operations specific to this directory
-../workbench/metadata/%.idmap: ../workbench/%.xml
- make -C ../workbench idmap
+$(REPO_ROOT)/workbench/metadata/%.idmap: $(REPO_ROOT)/workbench/%.xml
+ make -C $(REPO_ROOT)/workbench idmap
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r5767 - in trunk: . administrator administrator-ro falcon gui-common gui-common-cy gui-common-ro internals migration-to... | paul | 6 Apr |
