X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=m4%2Fmkmf.m4;h=07340616744acf7834051a8e2ec2c6a568f1a911;hb=bc67ca425528a7f2cb3563f343a9aacbfdcd3c0a;hp=7bdd7be024b1a2b2c61ab536be210adef29123b2;hpb=dd04a4d50eca47c8ce85bf75240331bcf27367f7;p=nsc-5.git

diff --git a/m4/mkmf.m4 b/m4/mkmf.m4
index 7bdd7be..0734061 100644
--- a/m4/mkmf.m4
+++ b/m4/mkmf.m4
@@ -10,8 +10,9 @@ define(`PRIMARIES', `')
 
 define(`nsc_prepend_cf_one', ` 'CFDIR/`nsc_file_name($1)')
 define(`nsc_prepend_cf_multi', `nsc_iterate(`nsc_prepend_cf_one', $@)')
-define(`nsc_key_dep', `ifelse(USE_DNSSEC,,,` 'keys/$1.hash)')
-define(`PRIMARY', `divert(0)zone/nsc_file_name($1):nsc_prepend_cf_multi($@)nsc_key_dep($1) $(DDEPS)
+define(`nsc_key_dep', `ifelse(USE_DNSSEC,,,` 'khash/$1 keys/resign-stamp)')
+define(`PRIMARY', `define(`CURRENT_TARGET',zone/nsc_file_name($1))
+divert(0)CURRENT_TARGET:nsc_prepend_cf_multi($@)nsc_key_dep($1) $(DDEPS)
 	@bin/genzone nsc_file_name($1)`'nsc_prepend_cf_multi($@)
 
 divert(-1)
@@ -22,6 +23,10 @@ define(`REVERSE', `PRIMARY(nsc_if_v6($1,`nsc_revblock6($1)',`nsc_revaddr($1)'),
 
 define(`BLACKHOLE', `define(`NEED_BLACKHOLE', 1)')
 
+define(`DSFOR', `divert(0)CURRENT_TARGET: dss/$1
+
+divert(-1)')
+
 # Insertion of raw makefile material
 
 define(`MAKEFILE', `divert(0)$1
@@ -33,12 +38,15 @@ define(`nsc_cleanup', `
 ifdef(`NEED_BLACKHOLE', `PRIMARY(blackhole)')
 
 divert(0)dnl
-ver/.version: CFDIR/domains ROOTCACHE`'PRIMARIES`'ifdef(`NEED_BLACKHOLE',` zone/blackhole')
+ver/.version: CFDIR/domains`'PRIMARIES`'ifdef(`NEED_BLACKHOLE',` zone/blackhole')
 	NAMED_RESTART_CMD
 	touch ver/.version
 
+keys/resign-stamp:
+	touch `$'@
+
 clean:
-	find bak zone hash dss -maxdepth 1 -type f | xargs rm -f
+	find bak zone hash tmp -maxdepth 1 -type f | xargs rm -f
 
 clobber: clean
 	rm -f Makefile named.conf bin/shell-env