DNSSEC: Complete support for key delegations to sub-domains

[nsc-5.git] / m4 / mkmf.m4

diff --git a/m4/mkmf.m4 b/m4/mkmf.m4
index 7d0f5d5e08240d109ace6c3d2c17c0ee87de5c71..29c8fd548639bff4a41b13653c0fe39a764ec135 100644 (file)
--- 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,,,` 'khash/$1 khash/resign-stamp)')
-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
@@ -37,8 +42,11 @@ ver/.version: CFDIR/domains ROOTCACHE`'PRIMARIES`'ifdef(`NEED_BLACKHOLE',` zone/
        NAMED_RESTART_CMD
        touch ver/.version
 
+keys/resign-stamp:
+       touch `$'@
+
 clean:
-       find bak zone hash -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