debian: Fix doc file list and lintian issues

[hcoop/debian/libapache-mod-waklog.git] / debian / rules

diff --git a/debian/rules b/debian/rules
old mode 100644 (file)
new mode 100755 (executable)
index 9b4028a..f62e79b
--- a/debian/rules
+++ b/debian/rules
@@ -8,32 +8,13 @@ else
        CFLAGS += -O2
 endif
 
-default:binary
-
-apache13:
+build-apache2:
        dh_testdir
        chmod +x regen.sh
        ./regen.sh
        ./configure \
          --with-afs-libs=/usr/lib/afs \
          --with-afs-headers=/usr/include/afs \
-         --with-apxs=/usr/bin/apxs
-       make clean
-       $(MAKE)
-       dh_installdirs
-       mkdir -p debian/libapache-mod-waklog/usr/lib/apache/1.3/
-       mkdir -p debian/libapache-mod-waklog/etc/apache/conf.d/
-       cp mod_waklog.so debian/libapache-mod-waklog/usr/lib/apache/1.3/
-       cp debian/waklog.load debian/libapache-mod-waklog/etc/apache/conf.d/waklog.conf
-
-apache20:
-       dh_testdir
-       chmod +x regen.sh
-       ./regen.sh
-       ./configure \
-         --with-afs-libs=/usr/lib/afs \
-         --with-afs-headers=/usr/include/afs \
-         --with-apache-headers=/usr/include/apache2 \
          --with-apxs=/usr/bin/apxs2
        make clean
        $(MAKE)
@@ -43,17 +24,24 @@ apache20:
        mkdir -p debian/libapache2-mod-waklog/etc/apache2/mods-available
        cp mod_waklog.so debian/libapache2-mod-waklog/usr/lib/apache2/modules/
        cp debian/waklog.load debian/libapache2-mod-waklog/etc/apache2/mods-available
+       touch build-apache2
 
 clean:
        dh_testdir
        dh_testroot
        rm -rf build-stamp .libs
-       -$(MAKE) clean
+       [ ! -f Makefile ] || $(MAKE) clean
+       [ ! -f Makefile ] || $(MAKE) distclean
+       rm -f aclocal.m4 configure compile install-sh missing Makefile.in mod_waklog.la mod_waklog.so
        dh_clean  --exclude ./_darcs/current/Makefile.orig --exclude ./Makefile.orig
 
-binary-indep:
+build: build-indep build-arch
+build-indep:
+build-arch: build-apache2
 
-binary-arch: apache13 apache20
+binary: binary-indep binary-arch
+binary-indep: build-indep
+binary-arch: build-arch
        dh_testdir
        dh_testroot
        dh_installchangelogs 
@@ -61,7 +49,7 @@ binary-arch: apache13 apache20
        dh_installexamples
        dh_installman
        dh_link
-       #dh_strip
+       dh_strip
        dh_compress
        dh_fixperms
        dh_installdeb
@@ -70,5 +58,4 @@ binary-arch: apache13 apache20
        dh_md5sums
        dh_builddeb
 
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
+.PHONY: build clean binary-indep binary-arch binary build-indep build-arch