X-Git-Url: http://git.home-dn.net/?p=manu%2Fsuphp.git;a=blobdiff_plain;f=debian%2Frules;h=ac86eff7ef8cf55417ffb5bec93645b2060949f2;hp=1e49b7a0929ceae73c55a0d9031f405b5b045c4b;hb=59c5bff8d9aef402c868519d13398ba4eb2dddb7;hpb=47bcf8ba77fa8011f9be728c23dbe6915d70251b

diff --git a/debian/rules b/debian/rules
index 1e49b7a..ac86eff 100755
--- a/debian/rules
+++ b/debian/rules
@@ -21,7 +21,10 @@ ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
 	INSTALL_PROGRAM += -s
 endif
 
-configure-apache:
+patch:
+	dpatch apply-all
+
+configure-apache: patch
 	dh_testdir
 	./configure --prefix=/usr \
 	--sysconfdir=/etc/suphp \
@@ -32,9 +35,9 @@ configure-apache:
 	--with-setid-mode=owner \
 	--with-logfile=/var/log/suphp/suphp.log
 
-configure-apache2:
+configure-apache2: patch
 	dh_testdir
-	./configure --prefix=/usr \
+	CPPFLAGS="`pkg-config --cflags apr-1`" ./configure --prefix=/usr \
 	--sysconfdir=/etc/suphp \
 	--with-apxs=/usr/bin/apxs2 \
 	--with-apache-user=www-data \
@@ -52,6 +55,8 @@ build-apache2: configure-apache2
 	dh_testdir
 	$(MAKE)
 
+build:
+
 clean:
 	dh_testdir
 	dh_testroot
@@ -60,9 +65,11 @@ clean:
 	rm -f libtool src/stamp-h
 	find . -name .libs | xargs rm -rf
 	find . -name .deps | xargs rm -rf
-	rm -f src/apache/mod_suphp.o src/apache/mod_suphp.lo src/apache/mod_suphp.la
+	rm -f src/apache/mod_suphp.o src/apache/mod_suphp.lo src/apache/mod_suphp.la src/stamp-h1
 	find . -name Makefile | xargs rm -f
 	dh_clean
+	dpatch deapply-all
+	rm -rf debian/patched
 
 install: build-apache build-apache2
 	dh_testdir
@@ -79,14 +86,14 @@ install: build-apache build-apache2
 
 
 # Build architecture-independent files here.
-binary-indep: install
+binary-indep: 
 # We have nothing to do by default.
 
 # Build architecture-dependent files here.
 binary-arch: install
 	dh_testdir
 	dh_testroot
-	dh_installdebconf	
+#	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
@@ -115,4 +122,4 @@ binary-arch: install
 	dh_builddeb
 
 binary: binary-indep binary-arch
-.PHONY: configure build clean binary-indep binary-arch binary install 
+.PHONY: configure build build-apache build-apache2 clean binary-indep binary-arch binary install patch unpatch