Get rid of apache1 stuff

diff --git a/debian/rules b/debian/rules
index b27175a5728f32d4cefdeb9d4c6562979915b888..41a05e1f8668e8c41bd790b89745e65a5bd4af79 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -71,15 +71,10 @@ build-stamp: patch-stamp
        CFLAGS="$(CFLAGS)" . $(GNUSTEP_SETUP); \
                $(MAKE) $(MAKE_FLAGS) all
 
-       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
+               $(MAKE) $(MAKE_FLAGS) APXS="/usr/bin/apxs2" APXS_INCLUDE_DIRS="$(shell apxs2 -q EXTRA_INCLUDES)" \
+               -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
-
        touch build-stamp
 
 clean: unpatch clean-controlfiles
@@ -87,7 +82,6 @@ clean: unpatch clean-controlfiles
        dh_testroot
        rm -f configure-stamp
        rm -f build-stamp
-       rm -rf sope-appserver/mod_ngobjweb-apache2
 
        if [ -l sope-core/NGStreams/config.guess ]; then \
                rm sope-core/NGStreams/config.guess; \