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

diff --git a/debian/rules b/debian/rules
index 959d1bf..26aa1ee 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,118 +1,46 @@
 #!/usr/bin/make -f
+# -*- makefile -*-
 # Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
+# This file was originally written by Joey Hess and Craig Small.
+# As a special exception, when this file is copied by dh-make into a
+# dh-make output file, you may use that output file without restriction.
+# This special exception was added by Craig Small in version 0.37 of dh-make.
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-# This is the debhelper compatibility version to use.
-export DH_COMPAT=3
+%:
+	dh $@  --with quilt,autotools-dev,autoreconf,apache2
 
-# These are used for cross-compiling and for saving the configure script
-# from having to guess our platform (since we know it already)
-DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-
-
-ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -g
-endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-	INSTALL_PROGRAM += -s
-endif
-
-configure-apache:
-	dh_testdir
-	./configure --prefix=/usr \
-	--sysconfdir=/etc/suphp \
-	--with-apxs=/usr/bin/apxs \
-	--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
-
-configure-apache2:
-	dh_testdir
-	CPPFLAGS="-I/usr/include/apr-0" ./configure --prefix=/usr \
+override_dh_auto_configure:
+	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:
 
-build-apache: configure-apache
-	dh_testdir
-	$(MAKE)
-
-build-apache2: configure-apache2
-	dh_testdir
-	$(MAKE)
-
-clean:
-	dh_testdir
-	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
-
-install: build-apache build-apache2
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	find -name ".svn" -type d | xargs rm -rf
-	dh_installdirs
+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/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
+	rm -f src/apache2/.libs/mod_suphp.so
+	mv src/apache2/.libs/mod_suphp.so.0.0.0 src/apache2/.libs/mod_suphp.so
 
-
-# Build architecture-independent files here.
-binary-indep: install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: install
-	dh_testdir
-	dh_testroot
-	dh_installdebconf	
+override_dh_installdocs:
 	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
-#	dh_installexamples
-#	dh_installmenu
-	dh_installlogrotate
-#	dh_installemacsen
-#	dh_installpam
-#	dh_installmime
-#	dh_installinit
-#	dh_installcron
-#	dh_installman
-#	dh_installinfo
+
+override_dh_installchangelogs:
 	dh_installchangelogs ChangeLog
-	dh_link
-	dh_strip
-	dh_compress
+
+override_dh_fixperms:
 	dh_fixperms
 	chmod u+s debian/suphp-common/usr/lib/suphp/suphp
-#	dh_makeshlibs
-	dh_installdeb
-#	dh_perl
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
 
-binary: binary-indep binary-arch
-.PHONY: configure build clean binary-indep binary-arch binary install 
+override_dh_makeshlibs:
+	# Not needed here, not a dynamic lib