Preparing for release of version 4.0

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

diff --git a/m4/mkmf.m4 b/m4/mkmf.m4
index bb65116baf1a03790c8e920fbfc73074bfac62a3..d224efa9b440421249b8d245cfc3d9165d71afe9 100644 (file)
--- a/m4/mkmf.m4
+++ b/m4/mkmf.m4
@@ -1,6 +1,6 @@
 dnl ###
 dnl ### NSC -- Makefile Builder
-dnl ### (c) 1997--2008 Martin Mares <mj@ucw.cz>
+dnl ### (c) 1997--2011 Martin Mares <mj@ucw.cz>
 dnl ###
 include(m4/dnslib.m4)
 
@@ -11,7 +11,7 @@ define(`PRIMARIES', `')
 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)
-       `$'(`M4') -DVERS=VERSDIR/nsc_file_name($1) `$'(NSC)nsc_prepend_cf_multi($@) >ZONEDIR/nsc_file_name($1)
+       @bin/genzone nsc_file_name($1)`'nsc_prepend_cf_multi($@)
 
 divert(-1)
 define(`PRIMARIES', PRIMARIES ZONEDIR/nsc_file_name($1))
@@ -28,19 +28,19 @@ divert(-1)')
 
 # Last words
 
-define(`nsc_cleanup', `divert(0)VERSDIR/.version: CFDIR/domains ROOTCACHE`'PRIMARIES`'ifdef(`NEED_BLACKHOLE',` ZONEDIR/blackhole')
+define(`nsc_cleanup', `
+ifdef(`NEED_BLACKHOLE', `PRIMARY(blackhole)')
+
+divert(0)dnl
+VERSDIR/.version: CFDIR/domains ROOTCACHE`'PRIMARIES`'ifdef(`NEED_BLACKHOLE',` ZONEDIR/blackhole')
        NAMED_RESTART_CMD
        touch VERSDIR/.version
-ifdef(`NEED_BLACKHOLE', `
-ZONEDIR/blackhole: CFDIR/blackhole $(DDEPS)
-       `$'(`M4') $(NSC) $< >`$'@
-')dnl
 
 clean:
-       find BAKDIR ZONEDIR -maxdepth 1 -type f | xargs rm -f
+       find BAKDIR ZONEDIR HASHDIR -maxdepth 1 -type f | xargs rm -f
 
 clobber: clean
-       rm -f Makefile named.conf
+       rm -f Makefile named.conf bin/genzone
 
 distclean: clobber
        find VERSDIR -maxdepth 1 -type f | xargs rm -f
@@ -53,9 +53,7 @@ divert(0)dnl
 `#'    Please don't edit manually
 `#'
 
-`M4'=M4
-NSC=m4/nsc.m4
-DDEPS=`$'(NSC) m4/dnslib.m4 cf/config
+DDEPS=m4/nsc.m4 m4/dnslib.m4 cf/config
 
 all: VERSDIR/.version
 m4wrap(`nsc_cleanup')