Sun May 26 13:28:23 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu>

	* time/Makefile (install-others): Also install posix/ZONE and
	right/ZONE for each ZONE in $(zonenames).
	(z.% rule): Generate rules for right/ZONE and posix/ZONE targets too,
	the difference begin leapseconds vs /dev/null as 3rd dep.  For
	original ZONE targets use $(leapseconds), to be set in Makeconfig.
	(target-zone-flavor): New variable.
	(tzcompile): Use it to get the right -d for posix/ and right/ flavors.
	* Makeconfig (leapseconds): New variable.

diff --git a/Makeconfig b/Makeconfig
index d871789..d2bbbb2 100644 (file)
--- a/Makeconfig
+++ b/Makeconfig
@@ -221,6 +221,16 @@ ifndef localtime-file
 localtime-file = $(sysconfdir)/localtime
 endif
 
+# What to use for leap second specifications in compiling the default
+# timezone files.  Set this to `/dev/null' for no leap second handling as
+# 1003.1 requires, or to `leapseconds' for proper leap second handling.
+# Both zone flavors are always available as `posix/ZONE' and `right/ZONE'.
+# This variable determines the default: if it's `/dev/null',
+# ZONE==posix/ZONE; if it's `leapseconds', ZONE==right/ZONE.
+ifndef leapseconds
+leapseconds = /dev/null
+endif
+
 # What timezone's DST rules should be used when a POSIX-style TZ
 # environment variable doesn't specify any rules.  For 1003.1 compliance
 # this timezone must use rules that are as U.S. federal law defines DST.

diff --git a/time/Makefile b/time/Makefile
index ac422bf..5efb638 100644 (file)
--- a/time/Makefile
+++ b/time/Makefile
@@ -64,7 +64,9 @@ installed-posixrules-file := $(firstword $(filter /%,$(posixrules-file)) \
 
 ifeq ($(cross-compiling),no)
 # Don't try to install the zoneinfo files since we can't run zic.
-install-others = $(addprefix $(zonedir)/,$(zonenames)) \
+install-others = $(addprefix $(zonedir)/,$(zonenames) \
+                                        $(zonenames:%=posix/%) \
+                                        $(zonenames:%=right/%)) \
                 $(installed-localtime-file) $(installed-posixrules-file)
 endif
 
@@ -81,8 +83,14 @@ $(tzfiles:%=$(objpfx)z.%): $(objpfx)z.%: % Makefile
         echo '$*-zones := $$(subst $$(nl), ,$$($*-zones))'             ;\
         echo 'ifdef $*-zones'                                          ;\
         echo '$$(addprefix $$(datadir)/zone%/,$$($*-zones)): \'        ;\
+        echo '$< $$(objpfx)zic $$(leapseconds) yearistype'             ;\
+        echo ' $$(tzcompile)'                                          ;\
+        echo '$$(addprefix $$(datadir)/zone%/right/,$$($*-zones)): \'  ;\
         echo '$< $$(objpfx)zic leapseconds yearistype'                 ;\
         echo ' $$(tzcompile)'                                          ;\
+        echo '$$(addprefix $$(datadir)/zone%/posix/,$$($*-zones)): \'  ;\
+        echo '$< $$(objpfx)zic /dev/null yearistype'                   ;\
+        echo ' $$(tzcompile)'                                          ;\
         echo 'endif'                                                   ;\
         echo 'zonenames := $$(zonenames) $$($*-zones)'                 ;\
        ) > $@.new
@@ -98,9 +106,18 @@ echo-zonenames: zonenames
 # the command line of `make install' (e.g., "make install prefix=/foo").
 zic-cmd = $(built-program-cmd) -d $(zonedir)
 define tzcompile
-$(zic-cmd) -L $(word 3,$^) -y $(dir $(word 4,$^))$(notdir $(word 4,$^)) $<
+$(zic-cmd)$(target-zone-flavor)
+ -L $(word 3,$^) -y $(dir $(word 4,$^))$(notdir $(word 4,$^)) $<
 endef
 
+# The source files specify the zone names relative to the -d directory,
+# so for the posix/ and right/ flavors we need to pass -d $(zonedir)/posix
+# and the like.  This magic extracts /posix or /right if it's the first
+# component after $(zonedir) in the target name $@.
+target-zone-flavor = $(filter /posix /right, \
+                             /$(firstword $(subst /, , \
+                                          $(patsubst $(zonedir)/%,%,$@))))
+
 ifdef localtime
 $(installed-localtime-file): $(zonedir)/$(localtime) $(objpfx)zic
        $(zic-cmd) -l $(localtime)