Most directory names are now fixed

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

diff --git a/m4/mkmf.m4 b/m4/mkmf.m4
index 6d8c90bd2c200e869dafc127209cc33c552bacff..7bdd7be024b1a2b2c61ab536be210adef29123b2 100644 (file)
--- a/m4/mkmf.m4
+++ b/m4/mkmf.m4
@@ -1,6 +1,6 @@
 dnl ###
 dnl ### NSC -- Makefile Builder
 dnl ###
 dnl ### NSC -- Makefile Builder

-dnl ### (c) 1997--2008 Martin Mares <mj@ucw.cz>
+dnl ### (c) 1997--2019 Martin Mares <mj@ucw.cz>

 dnl ###
 include(m4/dnslib.m4)
 
 dnl ###
 include(m4/dnslib.m4)
 


@@ -10,11 +10,12 @@ 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_prepend_cf_one', ` 'CFDIR/`nsc_file_name($1)')
 define(`nsc_prepend_cf_multi', `nsc_iterate(`nsc_prepend_cf_one', $@)')

-define(`PRIMARY', `divert(0)ZONEDIR/nsc_file_name($1):nsc_prepend_cf_multi($@) $(DDEPS)
+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)

        @bin/genzone nsc_file_name($1)`'nsc_prepend_cf_multi($@)
 
 divert(-1)
        @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(`REVERSE', `PRIMARY(nsc_if_v6($1,`nsc_revblock6($1)',`nsc_revaddr($1)'), shift($@))')


@@ -32,18 +33,18 @@ define(`nsc_cleanup', `
 ifdef(`NEED_BLACKHOLE', `PRIMARY(blackhole)')
 
 divert(0)dnl
 ifdef(`NEED_BLACKHOLE', `PRIMARY(blackhole)')
 
 divert(0)dnl

-VERSDIR/.version: CFDIR/domains ROOTCACHE`'PRIMARIES`'ifdef(`NEED_BLACKHOLE',` ZONEDIR/blackhole')
+ver/.version: CFDIR/domains ROOTCACHE`'PRIMARIES`'ifdef(`NEED_BLACKHOLE',` zone/blackhole')

        NAMED_RESTART_CMD
        NAMED_RESTART_CMD

-       touch VERSDIR/.version
+       touch ver/.version

 
 clean:
 
 clean:

-       find BAKDIR ZONEDIR HASHDIR -maxdepth 1 -type f | xargs rm -f
+       find bak zone hash dss -maxdepth 1 -type f | xargs rm -f

 
 clobber: clean
 
 clobber: clean

-       rm -f Makefile named.conf bin/genzone
+       rm -f Makefile named.conf bin/shell-env

 
 distclean: clobber
 
 distclean: clobber

-       find VERSDIR -maxdepth 1 -type f | xargs rm -f
+       find ver -maxdepth 1 -type f | xargs rm -f

 ')
 
 divert(0)dnl
 ')
 
 divert(0)dnl


@@ -55,6 +56,6 @@ divert(0)dnl
 
 DDEPS=m4/nsc.m4 m4/dnslib.m4 cf/config
 
 
 DDEPS=m4/nsc.m4 m4/dnslib.m4 cf/config
 

-all: VERSDIR/.version
+all: ver/.version

 m4wrap(`nsc_cleanup')
 divert(-1)
 m4wrap(`nsc_cleanup')
 divert(-1)