splitting drupal and PLEWWW

diff --git a/onelab-tags.mk b/onelab-tags.mk
index 854dbb6..deaff04 100644 (file)
--- a/onelab-tags.mk
+++ b/onelab-tags.mk
@@ -24,6 +24,7 @@ inotify-tools-SVNPATH         := http://svn.planet-lab.org/svn/inotify-tools/trunk
 vsys-SVNPATH                   := http://svn.planet-lab.org/svn/vsys/trunk
 dummynet_image-SVNPATH         := http://svn.planet-lab.org/svn/dummynet_image/trunk
 PLCAPI-SVNPATH                 := http://svn.planet-lab.org/svn/PLCAPI/trunk
+drupal-SVNPATH                 := http://svn.planet-lab.org/svn/drupal/trunk
 PLEWWW-SVNPATH                 := http://svn.planet-lab.org/svn/PLEWWW/trunk
 Monitor-SVNPATH                        := http://svn.planet-lab.org/svn/Monitor/trunk
 nodeconfig-SVNPATH             := http://svn.planet-lab.org/svn/nodeconfig/trunk

diff --git a/onelab.mk b/onelab.mk
index c3cff81..b91fc1b 100644 (file)
--- a/onelab.mk
+++ b/onelab.mk
@@ -240,11 +240,20 @@ PLCAPI-SPEC := PLCAPI.spec
 ALL += PLCAPI
 IN_MYPLC += PLCAPI
 
+#
+# 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
+PLEWWW-SPEC := PLCWWW.spec
 ALL += PLEWWW
 IN_MYPLC += PLEWWW