Mon May 27 10:10:00 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu>

	* time/Makefile (z.% rule): Generate generic zone%/ rule after
	zone%/right/ and zone%/posix/ rules so they match first.

diff --git a/ChangeLog b/ChangeLog
index 8d914b0..5df192e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon May 27 10:10:00 1996  Roland McGrath  <roland@delasyd.gnu.ai.mit.edu>
+
+       * time/Makefile (z.% rule): Generate generic zone%/ rule after
+       zone%/right/ and zone%/posix/ rules so they match first.
+
 Sun May 26 15:15:08 1996  Roland McGrath  <roland@delasyd.gnu.ai.mit.edu>
 
        * features.h [_GNU_SOURCE] (_BSD_SOURCE, _SVID_SOURCE,

diff --git a/time/Makefile b/time/Makefile
index fa7877d..bd4d6b1 100644 (file)
--- a/time/Makefile
+++ b/time/Makefile
@@ -82,15 +82,15 @@ $(tzfiles:%=$(objpfx)z.%): $(objpfx)z.%: % Makefile
         echo 'endef'                                                   ;\
         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 '$$(addprefix $$(datadir)/zone%/,$$($*-zones)): \'        ;\
+        echo '$< $$(objpfx)zic $$(leapseconds) yearistype'             ;\
+        echo ' $$(tzcompile)'                                          ;\
         echo 'endif'                                                   ;\
         echo 'zonenames := $$(zonenames) $$($*-zones)'                 ;\
        ) > $@.new