X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=m4%2Fmkmf.m4;h=7fc64e01638b0e8c47e0fe841880610e66712cdb;hb=674bba0d833cd91ca5fa71173b7e2f95c20502fa;hp=8bca9298f4e4b1fea26041161bded8f2f02550c4;hpb=e1865af4bbc397337b7144cfaf22f86cdf4e09d4;p=nsc-5.git

diff --git a/m4/mkmf.m4 b/m4/mkmf.m4
index 8bca929..7fc64e0 100644
--- a/m4/mkmf.m4
+++ b/m4/mkmf.m4
@@ -10,18 +10,23 @@ 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,,,` 'KEYDIR/$1.hash)')
-define(`PRIMARY', `divert(0)ZONEDIR/nsc_file_name($1):nsc_prepend_cf_multi($@)nsc_key_dep($1) $(DDEPS)
+define(`nsc_key_dep', `ifelse(USE_DNSSEC,,,` 'khash/nsc_file_name($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)
-define(`PRIMARIES', PRIMARIES ZONEDIR/nsc_file_name($1))
+define(`PRIMARIES', PRIMARIES zone/nsc_file_name($1))
 ')
 
 define(`REVERSE', `PRIMARY(nsc_if_v6($1,`nsc_revblock6($1)',`nsc_revaddr($1)'), shift($@))')
 
 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,18 +38,21 @@ define(`nsc_cleanup', `
 ifdef(`NEED_BLACKHOLE', `PRIMARY(blackhole)')
 
 divert(0)dnl
-VERSDIR/.version: CFDIR/domains ROOTCACHE`'PRIMARIES`'ifdef(`NEED_BLACKHOLE',` ZONEDIR/blackhole')
+ver/.version: CFDIR/domains`'PRIMARIES`'ifdef(`NEED_BLACKHOLE',` zone/blackhole')
 	NAMED_RESTART_CMD
-	touch VERSDIR/.version
+	touch ver/.version
+
+keys/resign-stamp:
+	touch `$'@
 
 clean:
-	find BAKDIR ZONEDIR HASHDIR DSSDIR -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
 
 distclean: clobber
-	find VERSDIR -maxdepth 1 -type f | xargs rm -f
+	find ver -maxdepth 1 -type f | xargs rm -f
 ')
 
 divert(0)dnl
@@ -56,6 +64,6 @@ divert(0)dnl
 
 DDEPS=m4/nsc.m4 m4/dnslib.m4 cf/config
 
-all: VERSDIR/.version
+all: ver/.version
 m4wrap(`nsc_cleanup')
 divert(-1)