Newer versions of GNU m4 require `-D' before file arguments.

diff --git a/README b/README
index e468dbed8ab474ac8a3d80884bb98bcdad2465ca..47393e279d1e83ee5e323d67799c3cb5a9be52f8 100644 (file)
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
 
-           Domain Name Server Configuration Utilities -- NSC 3.0.1
+           Domain Name Server Configuration Utilities -- NSC 3.0.2
 
-                   (c) 1997--2006 Martin Mares <mj@ucw.cz>
+                   (c) 1997--2008 Martin Mares <mj@ucw.cz>
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 

diff --git a/bin/nsconfig b/bin/nsconfig
index 9f075e87878fd86f55e8d9cd195520bff7ac7aa0..c23ebc780fe6083a507f042408b1202f1629890e 100755 (executable)
--- a/bin/nsconfig
+++ b/bin/nsconfig
@@ -1,6 +1,6 @@
 #!/bin/sh
 # NSC -- Makefile & Config file build script
-# (c) 1997--2003 Martin Mares <mj@ucw.cz>
+# (c) 1997--2008 Martin Mares <mj@ucw.cz>
 
 set -e
 
@@ -13,4 +13,4 @@ if [ ! -f $DOMAINS ] ; then
        fi
 
 $M4 m4/mkconf.m4 $DOMAINS >named.conf
-$M4 m4/mkmf.m4 $DOMAINS >Makefile -DM4=$M4
+$M4 -DM4=$M4 m4/mkmf.m4 $DOMAINS >Makefile

diff --git a/m4/mkmf.m4 b/m4/mkmf.m4
index 36c3b8f8a59ef41942c10013c26a9a6749e4f76e..ced7cd26ab0245c2b32b237244d0a7af8c607452 100644 (file)
--- a/m4/mkmf.m4
+++ b/m4/mkmf.m4
@@ -1,6 +1,6 @@
 dnl ###
 dnl ### NSC -- Makefile Builder
-dnl ### (c) 1997--2003 Martin Mares <mj@ucw.cz>
+dnl ### (c) 1997--2008 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)
-       `$'(NSC)nsc_prepend_cf_multi($@) >ZONEDIR/nsc_file_name($1) -DVERS=VERSDIR/nsc_file_name($1)
+       `$'(`M4') -DVERS=VERSDIR/nsc_file_name($1) `$'(NSC)nsc_prepend_cf_multi($@) >ZONEDIR/nsc_file_name($1)
 
 divert(-1)
 define(`PRIMARIES', PRIMARIES ZONEDIR/nsc_file_name($1))
@@ -31,13 +31,13 @@ define(`nsc_cleanup', `divert(0)VERSDIR/.version: CFDIR/domains ROOTCACHE`'PRIMA
        touch VERSDIR/.version
 
 clean:
-       find BAKDIR ZONEDIR -type f -maxdepth 1 | xargs rm -f
+       find BAKDIR ZONEDIR -maxdepth 1 -type f | xargs rm -f
 
 clobber: clean
        rm -f Makefile named.conf
 
 distclean: clobber
-       find VERSDIR -type f -maxdepth 1 | xargs rm -f
+       find VERSDIR -maxdepth 1 -type f | xargs rm -f
 ')
 
 divert(0)dnl
@@ -48,8 +48,8 @@ divert(0)dnl
 `#'
 
 `M4'=M4
-NSC=$(`M4') m4/nsc.m4
-DDEPS=m4/nsc.m4 m4/dnslib.m4 cf/config
+NSC=m4/nsc.m4
+DDEPS=`$'(NSC) m4/dnslib.m4 cf/config
 
 all: VERSDIR/.version
 m4wrap(`nsc_cleanup')

diff --git a/m4/nsc.m4 b/m4/nsc.m4
index 32cb79319020480e01c31592cd991c6f5a7b3c6f..30b2f1e0cea2e01b7f8e3da70bcf61650fe10c3f 100644 (file)
--- a/m4/nsc.m4
+++ b/m4/nsc.m4
@@ -1,8 +1,8 @@
 dnl ###
 dnl ### NSC -- Zone File Generator
-dnl ### (c) 1997--2003 Martin Mares <mj@ucw.cz>
+dnl ### (c) 1997--2008 Martin Mares <mj@ucw.cz>
 dnl ###
-dnl ### Usage: m4 nsc.m4 domain-source-files >zone-file -DVERS=path-to-version-file
+dnl ### Usage: m4 -DVERS=path-to-version-file nsc.m4 domain-source-files >zone-file
 dnl ###
 include(m4/dnslib.m4)