X-Git-Url: https://git.distorted.org.uk/~mdw/zones/blobdiff_plain/f54dd5ce2ae0a3a39ab6520ea898a6a62a280ad8..2d7b9fe6d9a55149315e927f6b17051f68c52618:/Makefile diff --git a/Makefile b/Makefile index 69191ed..89e15a3 100644 --- a/Makefile +++ b/Makefile @@ -162,13 +162,13 @@ ALL_ZONEDIFFS = $(foreach s,$(ZONESETS), \ $(foreach v,$($s_VIEWS), \ $(foreach z,$($s_all_ZONES) $($s_$v_ZONES), \ $v/$z.zonediff))) -run-nsdiff = nsdiff -d -v "" $2 \ +run-nsdiff = nsdiff -v "" $2 \ $($($(call notdir,$1)_ZONESET)_$(call dir-nosl,$1)_NSDIFF) \ $(call notdir,$1) $1.zone $(ALL_ZONEDIFFS) : %.zonediff : %.zone $(call v_tag,NSDIFF)$(call run-nsdiff,$*,-q); \ rc=$$?; case $$rc in 1) $(call run-nsdiff,$*); rc=$$? ;; esac; \ - case $$rc in 0 | 1) : ;; *) exit $$? ;; esac + case $$rc in 0 | 1) : ;; *) exit $$rc ;; esac diff: $(ALL_ZONEDIFFS) ## Finally we have to install the zone files.