* time/tzfile.h, time/private.h, time/zdump.c, time/zic.c,

 	time/africa, time/asia, time/australasia, time/europe,
 	time/northamerica, time/southamerica: Updated from ADO 96h.

	* Make-dist (all-headers): Filter $(sysdep_headers) out of $(headers).
	(try-sysdeps, +sysdep-names): Check sysdeps/libm-ieee754 too.

	* Makerules (distinfo-vars): Add sysdep_headers.
	* sysdeps/unix/sysv/linux/Makefile (sysdep_headers): Append to
	this instead of $(headers).
	* sysdeps/unix/sysv/linux/alpha/Makefile: Likewise.

	* Make-dist [subdirs-dirs]: Don't prefix $(subdir-dirs) with
	$(subdir); we are already there.

	* sysdeps/unix/sysv/sysv4/solaris2/sparc/Dist: Removed.

1 files changed, 35 insertions, 38 deletions

diff --git a/time/northamerica b/time/northamerica
index d142790..1d0342a 100644
--- a/time/northamerica
+++ b/time/northamerica
@@ -1,4 +1,4 @@
-# @(#)northamerica	7.22
+# @(#)northamerica	7.25
 # also includes Central America and the Caribbean
 
 # This data is by no means authoritative; if you think you know better,
@@ -160,11 +160,11 @@ Rule	Denver	1965	1966	-	Apr	lastSun	2:00	1:00	D
 Rule	Denver	1965	1966	-	Oct	lastSun	2:00	0	S
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone America/Denver	-6:59:56 -	LMT	1883 Nov 18 12:00
-			-7:00	US	E%sT	1920
-			-7:00	Denver	E%sT	1942
-			-7:00	US	E%sT	1946
-			-7:00	Denver	E%sT	1967
-			-7:00	US	E%sT
+			-7:00	US	M%sT	1920
+			-7:00	Denver	M%sT	1942
+			-7:00	US	M%sT	1946
+			-7:00	Denver	M%sT	1967
+			-7:00	US	M%sT
 
 # US Pacific time, represented by Los Angeles
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER
@@ -461,8 +461,6 @@ Link	Pacific/Honolulu	HST
 #
 # See the `africa' file for Zone naming conventions.
 
-
-
 # Canada
 
 # Canada is reportedly lots easier than the US--leastways since 1951.
@@ -569,11 +567,8 @@ Link	Pacific/Honolulu	HST
 # From Paul Eggert <eggert@twinsun.com> (1994-11-22):
 # Alas, this sort of thing must be handled by localization software.
 
-
-
 # From Shanks (1991):
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	StJohns	1884	only	-	Jan	 1	0:00	0	S
 Rule	StJohns	1917	1918	-	Apr	Sun>=8	2:00	1:00	D
 Rule	StJohns	1917	only	-	Sep	17	2:00	0	S
 Rule	StJohns	1918	only	-	Oct	31	2:00	0	S
@@ -612,7 +607,6 @@ Zone America/St_Johns	-3:30:52 -	LMT	1884
 			-3:30	StJohns	N%sT
 
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule Halifax	1902	only	-	Jun	15	0:00	0	S
 Rule Halifax	1916	only	-	Apr	 1	0:00	1:00	D
 Rule Halifax	1916	only	-	Oct	 1	0:00	0	S
 Rule Halifax	1918	only	-	Apr	14	2:00	1:00	D
@@ -658,7 +652,6 @@ Zone America/Halifax	-4:14:24 -	LMT	1902 Jun 15
 			-4:00	Halifax	A%sT
 
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	Mont	1884	only	-	Jan	 1	0:00	0	S
 Rule	Mont	1917	only	-	Mar	25	2:00	1:00	D
 Rule	Mont	1917	only	-	Apr	24	0:00	0	S
 Rule	Mont	1918	only	-	Apr	14	2:00	1:00	D
@@ -692,7 +685,6 @@ Zone America/Montreal	-4:54:16 -	LMT	1884
 			-5:00	Mont	E%sT
 
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	Winn	1887	only	-	Jul	16	0:00	0	S
 Rule	Winn	1916	only	-	Apr	23	0:00	1:00	D
 Rule	Winn	1916	only	-	Sep	17	0:00	0	S
 Rule	Winn	1918	only	-	Apr	14	2:00	1:00	D
@@ -721,7 +713,6 @@ Zone America/Winnipeg	-6:28:36 -	LMT	1887 Jul 16
 			-6:00	Winn	C%sT
 
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	Regina	1905	only	-	Sep	 1	0:00	0	S
 Rule	Regina	1918	only	-	Apr	14	2:00	1:00	D
 Rule	Regina	1918	only	-	Oct	31	2:00	0	S
 Rule	Regina	1930	1934	-	May	Sun>=1	0:00	1:00	D
@@ -742,7 +733,6 @@ Zone	America/Regina	-6:58:36 -	LMT	1905 Sep
 			-6:00	-	CST
 
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	Edm	1906	only	-	Sep	 1	0:00	0	S
 Rule	Edm	1918	1919	-	Apr	Sun>=8	2:00	1:00	D
 Rule	Edm	1918	only	-	Oct	31	2:00	0	S
 Rule	Edm	1919	only	-	May	27	2:00	0	S
@@ -765,7 +755,6 @@ Zone America/Edmonton	-7:33:52 -	LMT	1906 Sep
 			-7:00	Edm	M%sT
 
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	Vanc	1884	only	-	Jan	 1	0:00	0	S
 Rule	Vanc	1918	only	-	Apr	14	2:00	1:00	D
 Rule	Vanc	1918	only	-	Oct	31	2:00	0	S
 Rule	Vanc	1942	only	-	Feb	 9	2:00	1:00	D
@@ -780,7 +769,6 @@ Zone America/Vancouver	-8:12:28 -	LMT	1884
 			-8:00	Vanc	P%sT
 
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	Yukon	1900	only	-	Jan	 1	0:00	0	S
 Rule	Yukon	1918	only	-	Apr	14	2:00	1:00	D
 Rule	Yukon	1918	only	-	Oct	27	2:00	0	S
 Rule	Yukon	1919	only	-	May	25	2:00	1:00	D
@@ -848,22 +836,41 @@ Zone America/Whitehorse	-9:00:12 -	LMT	1900 Aug 20
 # a zone that's GMT-8 with DST; a zone that's always GMT-7;
 # a zone that's GMT-6 with DST; and a zone that's always GMT-6.
 
-# From Paul Eggert <eggert@twinsun.com> (November 18, 1993):
+# From Paul Eggert <eggert@twinsun.com> (1993-11-18):
 # Shanks also says there are four zones, but disagrees about the fourth.
 # Instead of GMT-6 with DST, he says there's GMT-8 without DST.
 
-# From Paul Eggert (1996-02-07):
-# Today in news:4f90v4$g6g@news.internet.com.mx, Kevin Pitts
-# <bravo2@internet.com.mx> wrote that Mexico will use Horario de Verano (DST)
-# starting this year with the same rules as the US, and gave FIDE as a source.
-# (FIDE is a private organization that promotes efficient electrical use.)
-# On 1996-02-02 Mario Camou wrote that the transition times are Apr Sun>=1
-# 0:00 and Nov 1 0:00 but also wrote ``The DST-out date looks a bit fishy''.
-# Go with Pitts after 1996, and with Shanks before that.
+# From Alan Perry <alan.perry@eng.sun.com> (1996-02-15):
+# A guy from our Mexico subsidiary finally found the Presidential Decree
+# outlining the timezone changes in Mexico.
+# 
+# ------------- Begin Forwarded Message -------------
+# 
+# I finally got my hands on the Official Presidential Decree that sets up the
+# rules for the DST changes. The rules are:
+# 
+# 1. The country is divided in 3 timezones:
+#    - Baja California Norte (the Mexico/BajaNorte TZ)
+#    - Baja California Sur, Nayarit, Sinaloa and Sonora (the Mexico/BajaSur TZ)
+#    - The rest of the country (the Mexico/General TZ)
+#    
+# 2. From the first Sunday in April at 2:00 AM to the last Sunday in October
+#    at 2:00 AM, the times in each zone are as follows:
+#    BajaNorte: GMT+7
+#    BajaSur:   GMT+6
+#    General:   GMT+5
+#    
+# 3. The rest of the year, the times are as follows:
+#    BajaNorte: GMT+8
+#    BajaSur:   GMT+7
+#    General:   GMT+6
+#    
+# The Decree was published in Mexico's Official Newspaper on January 4th.
+# 
+# -------------- End Forwarded Message --------------
 
 # From Shanks (1991):
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	Mexico	1922	only	-	Jan	1	0:00	0	S
 Rule	Mexico	1939	only	-	Feb	5	0:00	1:00	D
 Rule	Mexico	1939	only	-	Jun	25	0:00	0	S
 Rule	Mexico	1940	only	-	Dec	9	0:00	1:00	D
@@ -930,7 +937,6 @@ Zone	America/Antigua	-4:07:12 -	LMT	1912 Mar 2
 
 # Bahamas
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	Bahamas	1912	only	-	Mar	2	0:00	0	S
 Rule	Bahamas	1964	max	-	Oct	lastSun	2:00	0	S
 Rule	Bahamas	1964	1986	-	Apr	lastSun	2:00	1:00	D
 Rule	Bahamas	1987	max	-	Apr	Sun>=1	2:00	1:00	D
@@ -940,7 +946,6 @@ Zone	America/Nassau	-5:09:24 -	LMT	1912 Mar 2
 
 # Barbados
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	Barb	1932	only	-	Jan	1	0:00	0	S
 Rule	Barb	1977	only	-	Jun	12	2:00	1:00	D
 Rule	Barb	1977	1978	-	Oct	Sun>=1	2:00	0	S
 Rule	Barb	1978	1980	-	Apr	Sun>=15	2:00	1:00	D
@@ -954,7 +959,6 @@ Zone America/Barbados	-3:58:28 -	LMT	1924		# Bridgetown
 # Belize
 # Whitman entirely disagrees with Shanks; go with Shanks.
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	Belize	1912	only	-	Apr	 1	0:00	0	S
 Rule	Belize	1918	1942	-	Oct	Sun>=2	0:00	0:30	HD
 Rule	Belize	1919	1943	-	Feb	Sun>=9	0:00	0	S
 Rule	Belize	1973	only	-	Dec	 5	0:00	1:00	D
@@ -984,7 +988,6 @@ Zone	America/Cayman	-5:25:32 -	LMT	1890		# Georgetown
 # Shanks gives some very odd dates for 1991, and stops there.
 # For now, we won't guess further.
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	CR	1921	only	-	Jan	15	0:00	0	S
 Rule	CR	1979	1980	-	Feb	lastSun	0:00	1:00	D
 Rule	CR	1979	1980	-	Jun	Sun>=1	0:00	0	S
 Rule	CR	1991	only	-	Jan	19	0:00	1:00	D
@@ -1010,7 +1013,6 @@ Zone America/Costa_Rica	-5:36:20 -	LMT	1890		# San Jose
 
 # From Shanks (1991):
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	Cuba	1925	only	-	Jul	19	12:00	0	S
 Rule	Cuba	1928	only	-	Jun	10	0:00	1:00	D
 Rule	Cuba	1928	only	-	Oct	10	0:00	0	S
 Rule	Cuba	1940	1942	-	Jun	Sun>=1	0:00	1:00	D
@@ -1049,7 +1051,6 @@ Zone America/Dominica	-4:05:36 -	LMT	1911 Jul 1 0:01		# Roseau
 
 # Dominican Republic
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	DR	1933	only	-	Apr	1	12:00	0	S
 Rule	DR	1966	only	-	Oct	30	0:00	1:00	D
 Rule	DR	1967	only	-	Feb	28	0:00	0	S
 Rule	DR	1969	1973	-	Oct	lastSun	0:00	0:30	HD
@@ -1064,7 +1065,6 @@ Zone America/Santo_Domingo -4:39:36 -	LMT	1890
 
 # El Salvador
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	Salv	1921	only	-	Jan	1	0:00	0	S
 Rule	Salv	1987	1988	-	May	Sun>=1	0:00	1:00	D
 Rule	Salv	1987	1988	-	Sep	lastSun	0:00	0	S
 # There are too many San Salvadors elsewhere, so we'll use `El Salvador'.
@@ -1084,7 +1084,6 @@ Zone America/Guadeloupe	-4:06:08 -	LMT	1911 Jun 8	# Pointe a Pitre
 
 # Guatemala
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	Guat	1918	only	-	Oct	5	0:00	0	S
 Rule	Guat	1973	only	-	Nov	25	0:00	1:00	D
 Rule	Guat	1974	only	-	Feb	24	0:00	0	S
 Rule	Guat	1983	only	-	May	21	0:00	1:00	D
@@ -1095,7 +1094,6 @@ Zone America/Guatemala	-6:02:04 -	LMT	1918 Oct 5
 
 # Haiti
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	Haiti	1917	only	-	Jan	24	12:00	0	S
 Rule	Haiti	1983	only	-	May	8	0:00	1:00	D
 Rule	Haiti	1984	1987	-	Apr	lastSun	0:00	1:00	D
 Rule	Haiti	1983	1987	-	Oct	lastSun	0:00	0	S
@@ -1142,7 +1140,6 @@ Zone America/Montserrat	-4:08:52 -	LMT	1911 Jul 1 0:01   # Plymouth
 
 # Nicaragua
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	Nic	1975	only	-	Feb	16	0:00	0	S
 Rule	Nic	1979	1980	-	Mar	Sun>=16	0:00	1:00	D
 Rule	Nic	1979	1980	-	Jun	Mon>=23	0:00	0	S
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]