X-Git-Url: http://git.home-dn.net/?p=manu%2Fsuphp.git;a=blobdiff_plain;f=debian%2Frules;h=959d1bf8ed3add38ae733b037bce48fb833fecf9;hp=aa96cdd1d0e12b088ad722b057b56106c9c49175;hb=873afb00229b8e205345b6895eaad6602d5e10f4;hpb=728a5b3f000f892e52ecea98fcc8f0c5d7275b7b;ds=sidebyside

diff --git a/debian/rules b/debian/rules
index aa96cdd..959d1bf 100755
--- a/debian/rules
+++ b/debian/rules
@@ -24,19 +24,23 @@ endif
 configure-apache:
 	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:
 	dh_testdir
-	./configure --prefix=/usr \
+	CPPFLAGS="-I/usr/include/apr-0" ./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
 
 
@@ -53,6 +57,10 @@ clean:
 	dh_testroot
 	-$(MAKE) clean
 	rm -f config.log config.status src/config.h
+	rm -f libtool src/stamp-h1
+	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
 	find . -name Makefile | xargs rm -f
 	dh_clean
 
@@ -65,6 +73,9 @@ 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.
@@ -95,7 +106,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