changes to build Monitor docs as part of myplc-docs package.

diff --git a/config.planetlab/devel.pkgs b/config.planetlab/devel.pkgs
index f426b07..04f5e72 100644 (file)
--- a/config.planetlab/devel.pkgs
+++ b/config.planetlab/devel.pkgs
@@ -89,3 +89,5 @@ package-centos5: libnl-devel
 # zabbix/monitor
 package: net-snmp net-snmp-devel
 package+centos5: krb5-devel.@arch@ e2fsprogs-devel.@arch@ libidn-devel.@arch@
 # zabbix/monitor
 package: net-snmp net-snmp-devel
 package+centos5: krb5-devel.@arch@ e2fsprogs-devel.@arch@ libidn-devel.@arch@

+package: TurboGears
+package: python-cherrypy

diff --git a/onelab.mk b/onelab.mk
index 4d0ffa0..5fe9bce 100644 (file)
--- a/onelab.mk
+++ b/onelab.mk
@@ -407,7 +407,7 @@ ALL += myplc
 # myplc-docs only contains docs for PLCAPI and NMAPI, but
 # we still need to pull MyPLC, as it is where the specfile lies, 
 # together with the utility script docbook2drupal.sh
 # myplc-docs only contains docs for PLCAPI and NMAPI, but
 # we still need to pull MyPLC, as it is where the specfile lies, 
 # together with the utility script docbook2drupal.sh

-myplc-docs-MODULES := MyPLC PLCAPI NodeManager
+myplc-docs-MODULES := MyPLC PLCAPI NodeManager Monitor

 myplc-docs-SPEC := myplc-docs.spec
 ALL += myplc-docs
 
 myplc-docs-SPEC := myplc-docs.spec
 ALL += myplc-docs
 

diff --git a/planetlab.mk b/planetlab.mk
index 1c2fccd..f904ca0 100644 (file)
--- a/planetlab.mk
+++ b/planetlab.mk
@@ -372,7 +372,7 @@ ALL += myplc
 # myplc-docs only contains docs for PLCAPI and NMAPI, but
 # we still need to pull MyPLC, as it is where the specfile lies, 
 # together with the utility script docbook2drupal.sh
 # myplc-docs only contains docs for PLCAPI and NMAPI, but
 # we still need to pull MyPLC, as it is where the specfile lies, 
 # together with the utility script docbook2drupal.sh

-myplc-docs-MODULES := MyPLC PLCAPI NodeManager
+myplc-docs-MODULES := MyPLC PLCAPI NodeManager Monitor

 myplc-docs-SPEC := myplc-docs.spec
 ALL += myplc-docs
 
 myplc-docs-SPEC := myplc-docs.spec
 ALL += myplc-docs