From ec8b94291e249209da933110d8ecdaca1b4c43bb Mon Sep 17 00:00:00 2001
From: C Robert <crobert@inverse.ca>
Date: Wed, 29 Jul 2009 18:25:49 +0000
Subject: [PATCH] Removed mandatory build of mod_ngobjweb from debian/rules

Monotone-Parent: 2e6453c768913aface3391daa78a173f76bd1852
Monotone-Revision: 783f97bcf896d7f1f4a68b2bdb211c79e4383241

Monotone-Author: crobert@inverse.ca
Monotone-Date: 2009-07-29T18:25:49
Monotone-Branch: ca.inverse.sogo
---
 SOPE/sope-deb.diff | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/SOPE/sope-deb.diff b/SOPE/sope-deb.diff
index 1ac64dedb..00f30dc36 100644
--- a/SOPE/sope-deb.diff
+++ b/SOPE/sope-deb.diff
@@ -95,17 +95,26 @@ Index: debian/rules
  build-stamp: patch-stamp
  	dh_testdir
  
-@@ -69,6 +69,9 @@
+@@ -69,16 +69,10 @@
  	ln -s /usr/share/misc/config.sub sope-core/NGStreams/config.sub
  
  	CFLAGS="$(CFLAGS)" . $(GNUSTEP_SETUP); \
+-		$(MAKE) $(MAKE_FLAGS) all
 +		./configure --with-gnustep
-+
-+	CFLAGS="$(CFLAGS)" . $(GNUSTEP_SETUP); \
- 		$(MAKE) $(MAKE_FLAGS) all
  
- 	cp -R sope-appserver/mod_ngobjweb sope-appserver/mod_ngobjweb-apache2
-@@ -119,21 +122,21 @@
+-	cp -R sope-appserver/mod_ngobjweb sope-appserver/mod_ngobjweb-apache2
+-
+ 	CFLAGS="$(CFLAGS)" . $(GNUSTEP_SETUP); \
+-		$(MAKE) $(MAKE_FLAGS) APXS=/usr/bin/apxs -C sope-appserver/mod_ngobjweb all
+-	
+-	CFLAGS="$(CFLAGS)" . $(GNUSTEP_SETUP); \
+-		$(MAKE) $(MAKE_FLAGS) APXS="/usr/bin/apxs2" APXS_INCLUDE_DIRS="$(shell apxs2 -q EXTRA_INCLUDES)"\
+-		-C sope-appserver/mod_ngobjweb-apache2 all
++		$(MAKE) $(MAKE_FLAGS) all
+ 
+ 	touch build-stamp
+ 
+@@ -119,21 +113,21 @@
  	# Add here commands to install the package into debian/tmp
  	CFLAGS="$(CFLAGS)" . $(GNUSTEP_SETUP); \
  		$(MAKE) $(MAKE_FLAGS) install \