web pages now packaged separately in the plcwww rmp package

diff --git a/onelab-tags-rc2.mk b/onelab-tags-rc2.mk
index 765f2d1..0325693 100644 (file)
--- a/onelab-tags-rc2.mk
+++ b/onelab-tags-rc2.mk
@@ -52,6 +52,9 @@ new_plc_api-SVNPATH :=                svn+ssh://build@svn.one-lab.org/svn/new_plc_api/trunk
 vserver-reference-TAG :=       planetlab-4_0-rc2
 bootmanager-SVNPATH :=         svn+ssh://build@svn.one-lab.org/svn/bootmanager/trunk
 bootcd-SVNPATH :=              svn+ssh://build@svn.one-lab.org/svn/bootcd/trunk
-myplc-SVNPATH :=               svn+ssh://build@svn.one-lab.org/svn/myplc/trunk
+# xxx-ambiguous-xxx
+plcwww-SVNPATH :=              svn+ssh://build@svn.one-lab.org/svn/new_plc_www/trunk
 new_plc_www-SVNPATH :=                 svn+ssh://build@svn.one-lab.org/svn/new_plc_www/trunk
+# end
+myplc-SVNPATH :=               svn+ssh://build@svn.one-lab.org/svn/myplc/trunk
 plc/scripts-TAG :=             planetlab-4_0-rc2

diff --git a/onelab.mk b/onelab.mk
index 90a62f1..0ec4378 100644 (file)
--- a/onelab.mk
+++ b/onelab.mk
@@ -4,7 +4,7 @@
 # Mark Huang <mlhuang@cs.princeton.edu>
 # Copyright (C) 2003-2006 The Trustees of Princeton University
 #
-# $Id: onelab.mk,v 1.19 2007/03/19 13:26:55 thierry Exp $
+# $Id: onelab.mk,v 1.20 2007/04/16 12:55:26 thierry Exp $
 #
 
 #
@@ -360,7 +360,7 @@ ALL += plcwww
 # MyPLC
 #
 
-myplc-MODULE := build myplc new_plc_www plc/scripts
+myplc-MODULE := build myplc plc/scripts
 myplc-SPEC := myplc.spec
 # Package must be built as root
 myplc-RPMBUILD := sudo rpmbuild