Makefile: Allow command-line setting of `zone' options.

[zones] / Makefile

diff --git a/Makefile b/Makefile
index f6a075f..6c45ff8 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -63,12 +63,13 @@ ZONESETS            += distorted
 
 distorted_VIEWS                 = inside outside
 distorted_outside_NETS  = dmz jump
-distorted_inside_NETS   = any unsafe colo vpn upn
+distorted_inside_NETS   = any unsafe colo vpn nvpn upn nupn
 
 distorted_all_ZONES    += distorted.org.uk
 
 distorted_all_ZONES    += 195.113.2.81.in-addr.arpa
 distorted_all_ZONES    += 128-143.238.187.81.in-addr.arpa
+distorted_all_ZONES    += 64-79.12.169.217.in-addr.arpa
 distorted_all_ZONES    += 64-79.198.13.212.in-addr.arpa
 
 distorted_all_ZONES    += 199.29.172.in-addr.arpa
@@ -103,6 +104,7 @@ odin_all_ZONES               = odin.gg
 
 ZONE                    = zone
 V_ZONE                  = $(call v_tag,ZONE)$(ZONE)
+ZONEOPTS                =
 
 .SECONDEXPANSION: #sorry
 
@@ -114,7 +116,7 @@ $(ALL_ZONESTAMPS) : %.zonestamp : $$(notdir $$*).lisp hosts.lisp
        $(V_AT)mkdir -p $(dir $*)
        $(V_ZONE) -d$(dir $*) -fview/$(call dir-nosl,$*)$(hack \
                hack) $(addprefix -s, \
-               $($(notdir $*)_$(call dir-nosl,$*)_NETS)) $<
+               $($(notdir $*)_$(call dir-nosl,$*)_NETS)) $(ZONEOPTS) $<
        $(V_AT)touch $@
 all: $(ALL_ZONESTAMPS)
 CLEANFILES += $(sort $(foreach s,$(ZONESETS), \