tracking branches

[build.git] / planetlab.mk

diff --git a/planetlab.mk b/planetlab.mk
index f850dc2..d86e815 100644 (file)
--- a/planetlab.mk
+++ b/planetlab.mk
@@ -211,13 +211,38 @@ PLCAPI-SPEC := PLCAPI.spec
 ALL += PLCAPI
 IN_MYPLC += PLCAPI
 
+# #
+# # PLCWWW
+# #
+# PLCWWW-MODULES := PLCWWW
+# PLCWWW-SPEC := PLCWWW.spec
+# ALL += PLCWWW
+# IN_MYPLC += PLCWWW
+
+#
+# drupal
+# 
+drupal-MODULES := drupal
+drupal-SPEC := drupal.spec
+drupal-BUILD-FROM-SRPM := yes
+ALL += drupal
+IN_MYPLC += drupal
+
+#
+# use the plewww module instead
+#
+plewww-MODULES := PLEWWW
+plewww-SPEC := plewww.spec
+ALL += plewww
+IN_MYPLC += plewww
+
 #
-# PLCWWW
+# www-register-wizard
 #
-PLCWWW-MODULES := PLCWWW
-PLCWWW-SPEC := PLCWWW.spec
-ALL += PLCWWW
-IN_MYPLC += PLCWWW
+www-register-wizard-MODULES := www-register-wizard
+www-register-wizard-SPEC := www-register-wizard.spec
+ALL += www-register-wizard
+IN_MYPLC += www-register-wizard
 
 #
 # monitor
@@ -286,8 +311,6 @@ IN_MYPLC += bootcd
 #
 vserver-MODULES := VserverReference build
 vserver-SPEC := vserver-reference.spec
-# Package must be built as root
-vserver-RPMBUILD := sudo bash ./rpmbuild.sh
 vserver-DEPEND-PACKAGES := $(IN_VSERVER)
 vserver-DEPEND-FILES := RPMS/yumgroups.xml
 vserver-RPMDATE := yes
@@ -332,8 +355,6 @@ IN_MYPLC += noderepo
 #
 myplc-MODULES := MyPLC build 
 myplc-SPEC := myplc.spec
-# Package must be built as root
-myplc-RPMBUILD := sudo bash ./rpmbuild.sh
 myplc-DEPEND-FILES := myplc-release RPMS/yumgroups.xml
 ALL += myplc