Moved debhelper version to compat file

[manu/suphp.git] / debian / rules

diff --git a/debian/rules b/debian/rules
index ac86eff..f6c90db 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -5,9 +5,6 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-# This is the debhelper compatibility version to use.
-export DH_COMPAT=4
-
 # These are used for cross-compiling and for saving the configure script
 # from having to guess our platform (since we know it already)
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
@@ -24,17 +21,6 @@ endif
 patch:
        dpatch apply-all
 
-configure-apache: patch
-       dh_testdir
-       ./configure --prefix=/usr \
-       --sysconfdir=/etc/suphp \
-       --with-apxs=/usr/bin/apxs \
-       --with-apache-user=www-data \
-       --with-php=/usr/bin/php-cgi \
-       --sbindir=/usr/lib/suphp \
-       --with-setid-mode=owner \
-       --with-logfile=/var/log/suphp/suphp.log
-
 configure-apache2: patch
        dh_testdir
        CPPFLAGS="`pkg-config --cflags apr-1`" ./configure --prefix=/usr \
@@ -47,10 +33,6 @@ configure-apache2: patch
        --with-logfile=/var/log/suphp/suphp.log
 
 
-build-apache: configure-apache
-       dh_testdir
-       $(MAKE)
-
 build-apache2: configure-apache2
        dh_testdir
        $(MAKE)
@@ -60,7 +42,7 @@ build:
 clean:
        dh_testdir
        dh_testroot
-       -$(MAKE) clean
+       [ ! -f Makefile ] || $(MAKE) clean
        rm -f config.log config.status src/config.h
        rm -f libtool src/stamp-h
        find . -name .libs | xargs rm -rf
@@ -71,7 +53,7 @@ clean:
        dpatch deapply-all
        rm -rf debian/patched
 
-install: build-apache build-apache2
+install: build-apache2
        dh_testdir
        dh_testroot
        dh_clean -k
@@ -81,7 +63,6 @@ install: build-apache build-apache2
        docbook-to-man debian/suphp-common.manpage.sgml > debian/suphp-common/usr/share/man/man8/suphp.8
        install -m 644 debian/suphp-common.lintian-override debian/suphp-common/usr/share/lintian/overrides/suphp-common
        mv debian/suphp-common/etc/suphp/suphp.conf-example debian/suphp-common/etc/suphp/suphp.conf
-       mv debian/libapache-mod-suphp/usr/lib/apache/1.3/mod_suphp.so.0.0.0 debian/libapache-mod-suphp/usr/lib/apache/1.3/mod_suphp.so
        mv debian/libapache2-mod-suphp/usr/lib/apache2/modules/mod_suphp.so.0.0.0 debian/libapache2-mod-suphp/usr/lib/apache2/modules/mod_suphp.so
 
 
@@ -95,7 +76,6 @@ binary-arch: install
        dh_testroot
 #      dh_installdebconf       
        dh_installdocs
-       mv debian/libapache-mod-suphp/usr/share/doc/libapache-mod-suphp/INSTALL debian/libapache-mod-suphp/usr/share/doc/libapache-mod-suphp/README
        mv debian/libapache2-mod-suphp/usr/share/doc/libapache2-mod-suphp/INSTALL debian/libapache2-mod-suphp/usr/share/doc/libapache2-mod-suphp/README
 #      dh_installexamples
 #      dh_installmenu
@@ -122,4 +102,4 @@ binary-arch: install
        dh_builddeb
 
 binary: binary-indep binary-arch
-.PHONY: configure build build-apache build-apache2 clean binary-indep binary-arch binary install patch unpatch
+.PHONY: configure build build-apache2 clean binary-indep binary-arch binary install patch unpatch