From 0715032c7585228e5c56d552a851ed71e08e7dfc Mon Sep 17 00:00:00 2001 From: Ben Finney Date: Thu, 22 Oct 2015 13:47:18 +1100 Subject: [PATCH] Express build customisations only on Debhelper override targets. --- debian/rules | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/debian/rules b/debian/rules index 0b63ab4..d090f0d 100755 --- a/debian/rules +++ b/debian/rules @@ -85,7 +85,6 @@ RST2MAN = rst2man .PHONY: build build: build-arch build-indep -build: remove-bundled-libraries dh $@ --with python2,python3 .PHONY: build-arch @@ -126,16 +125,8 @@ ${DOCUMENTATION_DIR}/%${MANPAGE_SUFFIX}: ${DOCUMENTATION_DIR}/${default_manpage_ cat debian/manpage_encoding_declaration.UTF-8 "$@".tmp > "$@" -.PHONY: clean clean: dh $@ --with python2,python3 - $(RM) -r ${GENERATED_FILES} - -.PHONY: override_dh_auto_clean -override_dh_auto_clean: - dh_auto_clean - $(RM) -r build - $(RM) -r ${egg_info_dir} .PHONY: get-packaged-orig-source @@ -215,7 +206,7 @@ override_dh_strip: dh_strip --package=${PYTHON2_PACKAGE_NAME} --dbg-package=${python2_debug_package_name} dh_strip --package=${PYTHON3_PACKAGE_NAME} --dbg-package=${python3_debug_package_name} -.PHONY: override_dh_auto_build +override_dh_auto_build: remove-bundled-libraries override_dh_auto_build: $(foreach pyversion,${PYTHON_VERSIONS},$(pyversion:%=build-python%)) override_dh_auto_build: dh_auto_build @@ -256,6 +247,12 @@ override_dh_installdocs: override_dh_installman: manpage-symlinks dh_installman +override_dh_auto_clean: + dh_auto_clean + $(RM) -r build + $(RM) -r ${egg_info_dir} + $(RM) -r ${GENERATED_FILES} + # Local variables: # mode: makefile -- 2.11.4.GIT