From 5bd731ce1771bebb59f2d0b61fdf34e8de681edb Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Tue, 11 Nov 2008 18:19:17 +0000 Subject: Update CDBS snippet makefile.mk: Cleanup check stamp dir for flavored builds. Fixing failure to build twice in a row. --- diff --git a/debian/cdbs/1/class/makefile.mk b/debian/cdbs/1/class/makefile.mk index 2f4e98f..7a50962 100644 --- a/debian/cdbs/1/class/makefile.mk +++ b/debian/cdbs/1/class/makefile.mk @@ -46,7 +46,7 @@ DEB_PHONY_RULES += makefile-clean $(cdbs_make_clean_nonstamps) pre-build:: $(if $(cdbs_make_multibuilds),mkdir -p debian/stamp-makefile-build debian/stamp-makefile-install) - $(and $(cdbs_make_multibuilds),$(not $(findstring nocheck,$(DEB_BUILD_OPTIONS))),$(DEB_MAKE_CHECK_TARGET),mkdir -p debian/stamp-makefile-check) + $(and $(cdbs_make_multibuilds),$(DEB_MAKE_CHECK_TARGET),mkdir -p debian/stamp-makefile-check) common-build-arch common-build-indep:: $(cdbs_make_build_stamps) $(cdbs_make_build_stamps): @@ -74,7 +74,7 @@ $(cdbs_make_check_stamps) : debian/stamp-makefile-check% : debian/stamp-makefile $(if $(DEB_MAKE_CHECK_TARGET),touch $@) makefile-clean:: - $(if $(DEB_MAKE_CHECK_TARGET),rm -f debian/stamp-makefile-check) + $(if $(DEB_MAKE_CHECK_TARGET),$(if $(cdbs_make_multibuilds),-rmdir --ignore-fail-on-non-empty debian/stamp-makefile-check,rm -f debian/stamp-makefile-check)) $(cdbs_make_clean_nonstamps):: $(if $(cdbs_make_multibuilds),rm -f $(@:makefile-clean%=debian/stamp-makefile-check%)) -- cgit v0.9.1