X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=m4%2Fmkmf.m4;h=fcf21a45ae40150d492986730ef0ca4c8cd9978e;hb=2c5837136158422b198dd306e66f71c4db87182f;hp=fd4ca8755a75c6fa2036492976b2bda5964ab712;hpb=7924609d3df88db112c092a1cdd761026d23e361;p=nsc-5.git

diff --git a/m4/mkmf.m4 b/m4/mkmf.m4
index fd4ca87..fcf21a4 100644
--- 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))
@@ -31,16 +31,16 @@ divert(-1)')
 define(`nsc_cleanup', `
 ifdef(`NEED_BLACKHOLE', `PRIMARY(blackhole)')
 
-divert(0)VERSDIR/.version: CFDIR/domains ROOTCACHE`'PRIMARIES`'ifdef(`NEED_BLACKHOLE',` ZONEDIR/blackhole')
+divert(0)dnl
+VERSDIR/.version: CFDIR/domains ROOTCACHE`'PRIMARIES`'ifdef(`NEED_BLACKHOLE',` ZONEDIR/blackhole')
 	NAMED_RESTART_CMD
 	touch VERSDIR/.version
-')dnl
 
 clean:
-	find BAKDIR ZONEDIR -maxdepth 1 -type f | xargs rm -f
+	find BAKDIR ZONEDIR HASHDIR DSSDIR -maxdepth 1 -type f | xargs rm -f
 
 clobber: clean
-	rm -f Makefile named.conf
+	rm -f Makefile named.conf bin/shell-env
 
 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')