X-Git-Url: http://git.home-dn.net/?p=manu%2Fsuphp.git;a=blobdiff_plain;f=debian%2Frules;h=26aa1ee9ab7585705191811186fde7a0a2605cae;hp=273ed03eecbe901c53e9e8f19dbe9ead3f4489c7;hb=320e08d63311de8d194e8882097f50ffd6d2725d;hpb=88b7dcdb9a17b27d5ba40fd17ae106bd028759b4

diff --git a/debian/rules b/debian/rules
index 273ed03..26aa1ee 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,26 +10,26 @@
 #export DH_VERBOSE=1
 
 %:
-	dh $@  --with quilt,autotools-dev,autoreconf
+	dh $@  --with quilt,autotools-dev,autoreconf,apache2
 
 override_dh_auto_configure:
-	CPPFLAGS="`pkg-config --cflags apr-1`" ./configure --prefix=/usr \
+	CFLAGS="$(CFLAGS) `pkg-config --cflags apr-1`" ./configure --prefix=/usr \
 	--sysconfdir=/etc/suphp \
 	--with-apxs=/usr/bin/apxs2 \
 	--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
 
+override_dh_auto_install:
 
 override_dh_install:
 	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/libapache2-mod-suphp/usr/lib/apache2/modules/mod_suphp.so.0.0.0 debian/libapache2-mod-suphp/usr/lib/apache2/modules/mod_suphp.so
-
+	rm -f src/apache2/.libs/mod_suphp.so
+	mv src/apache2/.libs/mod_suphp.so.0.0.0 src/apache2/.libs/mod_suphp.so
 
 override_dh_installdocs:
 	dh_installdocs
@@ -42,3 +42,5 @@ override_dh_fixperms:
 	dh_fixperms
 	chmod u+s debian/suphp-common/usr/lib/suphp/suphp
 
+override_dh_makeshlibs:
+	# Not needed here, not a dynamic lib