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

diff --git a/debian/rules b/debian/rules
index aa96cdd..ac86eff 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,7 +6,7 @@
 #export DH_VERBOSE=1
 
 # This is the debhelper compatibility version to use.
-export DH_COMPAT=3
+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)
@@ -21,22 +21,29 @@ 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 \
 	--with-apxs=/usr/bin/apxs \
 	--with-apache-user=www-data \
-	--with-php=/usr/lib/cgi-bin/php4 \
+	--with-php=/usr/bin/php-cgi \
 	--sbindir=/usr/lib/suphp \
+	--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 \
-	--with-php=/usr/lib/cgi-bin/php4 \
+	--with-php=/usr/bin/php-cgi \
 	--sbindir=/usr/lib/suphp \
+	--with-setid-mode=owner \
 	--with-logfile=/var/log/suphp/suphp.log
 
 
@@ -48,13 +55,21 @@ build-apache2: configure-apache2
 	dh_testdir
 	$(MAKE)
 
+build:
+
 clean:
 	dh_testdir
 	dh_testroot
 	-$(MAKE) clean
 	rm -f config.log config.status src/config.h
+	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 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
@@ -65,17 +80,20 @@ install: build-apache build-apache2
 	dh_install
 	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
 
 
 # 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
@@ -95,7 +113,7 @@ binary-arch: install
 	dh_compress
 	dh_fixperms
 	chmod u+s debian/suphp-common/usr/lib/suphp/suphp
-	dh_makeshlibs
+#	dh_makeshlibs
 	dh_installdeb
 #	dh_perl
 	dh_shlibdeps
@@ -104,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