Merge branch 'master' of metalzone.distorted.org.uk:~mdw/public-git/zones

* 'master' of metalzone.distorted.org.uk:~mdw/public-git/zones:
  Makefile.m4: Make the LaTeX documnt be optional.
  harlequin.lisp: Use the statically defined address for `guvnor'.
  distorted.lisp, harlequin.lisp: Use explicit filetype for `hosts.lisp'.

diff --git a/Makefile.m4 b/Makefile.m4
index 75c33a5..eee0291 100644 (file)
--- a/Makefile.m4
+++ b/Makefile.m4
@@ -64,7 +64,8 @@ m4_divert(20)
 ###--------------------------------------------------------------------------
 ### Rules
 
-all: $(ALL_ZONE_FILES) $(DOC_OUTPUTS)
+all: $(ALL_ZONE_FILES)
+doc: $(DOC_OUTPUTS)
 
 install: all
        ##

diff --git a/distorted.lisp b/distorted.lisp
index ed09808..6291e8b 100644 (file)
--- a/distorted.lisp
+++ b/distorted.lisp
@@ -1,6 +1,6 @@
 ;;; Zone file for distorted.org.uk
 
-(load "hosts" :verbose nil)
+(load "hosts.lisp" :verbose nil)
 
 ;;;--------------------------------------------------------------------------
 ;;; Network allocations

diff --git a/harlequin.lisp b/harlequin.lisp
index 65374b5..ecb2a67 100644 (file)
--- a/harlequin.lisp
+++ b/harlequin.lisp
@@ -1,6 +1,6 @@
 ;;; Zone file for harlequin.org.uk
 
-(load "hosts" :verbose nil)
+(load "hosts.lisp" :verbose nil)
 
 (setf *default-zone-admin* "hostmaster@distorted.org.uk")
 
@@ -11,8 +11,8 @@
    (defhost bloghost vampire))
   (t
    (setf *default-zone-source* 'guvnor.distorted.org.uk.)
-   (defhost mail guvnor.demon)
-   (defhost bloghost guvnor.demon)))
+   (defhost mail guvnor.distorted.org.uk)
+   (defhost bloghost guvnor.distorted.org.uk)))
 
 (defzone harlequin.org.uk
   ;;