web pages now packaged separately in the plcwww rmp package

diff --git a/onelab-tags.mk b/onelab-tags.mk
index ad84a21..a4db5e2 100644 (file)
--- a/onelab-tags.mk
+++ b/onelab-tags.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-branch
 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-branch

diff --git a/onelab.mk b/onelab.mk
index 7357deb..90a62f1 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.18 2007/03/19 09:18:54 thierry Exp $
+# $Id: onelab.mk,v 1.19 2007/03/19 13:26:55 thierry Exp $
 #
 
 #
@@ -348,6 +348,14 @@ ALL += bootcd
 # bootcd requires current packages
 bootcd: $(filter-out bootcd,$(ALL))
 
+#
+# plcwww
+#
+
+plcwww-MODULE := new_plc_www
+plcwww-SPEC := plcwww.spec
+ALL += plcwww
+
 #
 # MyPLC
 #