[Pkg-voip-commits] r7840 - /opensips/trunk/debian/rules

[alerios at alioth.debian.org]

Author: alerios
Date: Tue Dec  1 04:50:08 2009
New Revision: 7840

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=7840
Log:
* Assure no OpenSSL packages are built by default

Modified:
    opensips/trunk/debian/rules

Modified: opensips/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/opensips/trunk/debian/rules?rev=7840&op=diff
==============================================================================
--- opensips/trunk/debian/rules (original)
+++ opensips/trunk/debian/rules Tue Dec  1 04:50:08 2009
@@ -10,8 +10,7 @@
 	opensips-perl-modules opensips-snmpstats-module opensips-xmpp-module \
 	opensips-carrierroute-module opensips-berkeley-module \
 	opensips-ldap-modules opensips-geoip-module opensips-regex-module \
-	opensips-identity-module opensips-b2bua-module opensips-dbhttp-module \
-	opensips-console
+	opensips-b2bua-module opensips-dbhttp-module opensips-console
 
 DEBVERSION:=$(shell head -n 1 debian/changelog \
                     | sed -e 's/^[^(]*(\([^)]*\)).*/\1/')
@@ -36,18 +35,18 @@
 # Disabled by default due to license issues, set to non-void to enable
 OSP=
 
+ifeq (,$(OSP))
+	DH_OPTIONS += -Nopensips-osp-module
+else
+	ALL_PACKAGES += opensips-osp-module
+endif
+
 # Do we want to build the IDENTITY module ?
 # Disabled by default due to license issues, set to non-void to enable
 IDENTITY=
 
-ifeq (,$(OSP))
-	DH_OPTIONS = -Nopensips-osp-module
-else
-	ALL_PACKAGES += opensips-osp-module
-endif
-
 ifeq (,$(IDENTITY))
-	DH_OPTIONS = -Nopensips-identity-module
+	DH_OPTIONS += -Nopensips-identity-module
 else
 	ALL_PACKAGES += opensips-identity-module
 endif