From e71fbd7ec9677d544a0f4e5d3985209e6d10281c Mon Sep 17 00:00:00 2001 From: Sebastian Harl Date: Wed, 4 Mar 2009 20:31:17 +0100 Subject: [PATCH] rules: Cleanup. There is no need to have build-arch and build-indep - especially if the latter is empty. Removed configure from .PHONY to prevent configure being called twice. --- debian/changelog | 5 ++++- debian/rules | 48 ++++++++++++++++++++++++------------------------ 2 files changed, 28 insertions(+), 25 deletions(-) diff --git a/debian/changelog b/debian/changelog index 5ae0ff5..e69e871 100644 --- a/debian/changelog +++ b/debian/changelog @@ -16,6 +16,9 @@ mlmmj (1.2.16-0.1) unstable; urgency=low * debian/dirs: - Removed. This file is not needed. * debian/rules: + - Cleanup: There is no need to have build-arch and build-indep - + especially if the latter is empty. Removed configure from .PHONY to + prevent configure being called twice. - Rename mlmmj-make-ml.sh.1 to mlmmj-make-ml.1, since we rename the binary as well. - Do not manually install listtexts - the upstream build system takes care @@ -30,7 +33,7 @@ mlmmj (1.2.16-0.1) unstable; urgency=low - Added 01_fix_manpages to fix the what-is entry of the mlmmj-sub and mlmmj-unsub manpages. - -- Sebastian Harl Wed, 04 Mar 2009 19:58:18 +0100 + -- Sebastian Harl Wed, 04 Mar 2009 20:29:21 +0100 mlmmj (1.2.15-1.1) unstable; urgency=low diff --git a/debian/rules b/debian/rules index 23c42e4..53d7e50 100755 --- a/debian/rules +++ b/debian/rules @@ -1,16 +1,11 @@ #!/usr/bin/make -f -# -*- makefile -*- -# Sample debian/rules that uses debhelper. -# GNU copyright 1997 to 1999 by Joey Hess. +# debian/rules for mlmmj +# (based on the sample debian/rules by Joey Hess +# and Craig Small as shipped with dh-make). # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -export PACKAGE=mlmmj -export DH_OPTIONS -export TEXTDIR = $(CURDIR)/debian/mlmmj/usr/share/mlmmj/text.skel -CONFIGURERUN=no - include /usr/share/dpatch/dpatch.make # These are used for cross-compiling and for saving the configure script @@ -34,32 +29,31 @@ else endif -config.status: patch-stamp configure +config.status: configure patch-stamp + dh_testdir ./configure $(confflags) -build-arch: build-arch-stamp config.status +build: build-stamp + +build-stamp: config.status dh_testdir $(MAKE) -build-arch-stamp: - touch build-arch-stamp -build-indep-stamp: - touch build-indep-stamp - -build-indep: build-indep-stamp config.status + touch build-stamp clean: unpatch + dh_testdir + dh_testroot + rm -f build-stamp [ ! -f Makefile ] || $(MAKE) distclean - rm -f build-stamp build-indep-stamp build-arch-stamp config.log configure-stamp - rm -rf $(CURDIR)/debian/DEBIAN dh_clean -install-arch: build-arch +install-arch: build dh_testdir dh_testroot dh_clean -k - dh_installdirs + dh_installdirs -a $(MAKE) install DESTDIR=$(CURDIR)/debian/mlmmj @@ -73,8 +67,13 @@ install-arch: build-arch debian/mlmmj/usr/share/man/man1/mlmmj-make-ml.1 dh_install -s -install-indep: build-indep - # mlmmj-php-web +install-indep: + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs -i + + # mlmmj-php-web install -m 644 -D $(CURDIR)/contrib/web/php-user/mlmmj.php \ $(CURDIR)/debian/mlmmj-php-web/var/www/mlmmj-php-web/mlmmj.php install -m 644 -D $(CURDIR)/contrib/web/php-user/README \ @@ -102,7 +101,8 @@ binary-common: dh_testdir dh_testroot dh_installchangelogs ChangeLog - dh_installdocs -A FAQ TUNABLES TODO UPGRADE AUTHORS README README.access VERSION README.exim4 README.sendmail + dh_installdocs -A FAQ TUNABLES TODO UPGRADE AUTHORS README README.access \ + VERSION README.exim4 README.sendmail dh_installdebconf dh_installexamples dh_installdebconf @@ -127,4 +127,4 @@ binary: binary-arch binary-indep build: build-arch build-indep -.PHONY: build-arch build-indep clean binary-indep binary-arch binary-common install-indep install-arch build configure +.PHONY: build-arch build-indep clean binary-indep binary-arch binary-common install-indep install-arch build -- 2.30.2