add support for DEPENDDEVELRPMS

[build.git] / planetlab.mk

diff --git a/planetlab.mk b/planetlab.mk
index 1643166..4444d37 100644 (file)
--- a/planetlab.mk
+++ b/planetlab.mk
@@ -102,21 +102,19 @@ ALL += pl_sshd
 # Deprecate when vsys takes over [sapan].
 # keep in build for proper.
 #
-libhttpd++-MODULES := libhttpd++
-libhttpd++-SPEC := libhttpd++.spec
-ALL += libhttpd++
+libhttpd-MODULES := libhttpd++
+libhttpd-SPEC := libhttpd++.spec
+ALL += libhttpd
 
 #
 # proper: Privileged Operations Service
 #
 proper-MODULES := proper
 proper-SPEC := proper.spec
-proper-RPMBUILD := sudo bash ./rpmbuild.sh
-# proper uses scripts in util-python for building
-proper-DEPENDDEVELS := libhttpd++ util-python
-# disabled temporarily (or ?)
-# need to check that these two define a -devel package
-#ALL += proper
+#proper-RPMBUILD := sudo bash ./rpmbuild.sh
+proper-DEPENDS := libhttpd
+proper-DEPENDDEVELRPMS := libhttpd++
+ALL += proper
 
 #
 # codemux: Port 80 demux
@@ -175,9 +173,9 @@ ALL += iproute
 #
 # [marc]    deprecate with proper
 #
-util-python-MODULES := util-python
-util-python-SPEC := util-python.spec
-ALL += util-python
+#util-python-MODULES := util-python
+#util-python-SPEC := util-python.spec
+#ALL += util-python
 
 #
 # vsys