---- Makefile.orig 2012-10-15 16:32:13.248683438 +0000
-+++ Makefile 2012-10-15 16:33:33.324686164 +0000
-@@ -219,8 +219,8 @@
- # If you want zic's -s option used when installing, uncomment the next line
- # ZFLAGS= -s
+--- Makefile.orig 2014-10-01 15:40:50.900427432 +0000
++++ Makefile 2014-10-01 15:42:37.400428739 +0000
+@@ -231,8 +231,8 @@
+
+ LDFLAGS= $(LFLAGS)
-zic= ./zic
-ZIC= $(zic) $(ZFLAGS)
+ZIC_HOST= ./zic_host
+ZIC= $(ZIC_HOST) $(ZFLAGS)
- # The name of a Posix-compliant `awk' on your system.
- AWK= awk
-@@ -301,7 +301,7 @@
- ALL: all date
+ ZFLAGS=
- install: all $(DATA) $(REDO) $(MANS) $(TABDATA)
+@@ -347,7 +347,7 @@
+ $(DESTDIR)$(LIBDIR) $(DESTDIR)$(BINDIR) \
+ $(DESTDIR)$(MANDIR)/man3 $(DESTDIR)$(MANDIR)/man5 \
+ $(DESTDIR)$(MANDIR)/man8
- $(ZIC) -y $(YEARISTYPE) \
+ $(ZIC_HOST) -y $(YEARISTYPE) \
- -d $(TZDIR) -l $(LOCALTIME) -p $(POSIXRULES)
- -rm -f $(TZDIR)/iso3166.tab $(TZDIR)/zone.tab
- cp iso3166.tab zone.tab $(TZDIR)/.
-@@ -341,10 +341,10 @@
- chmod +x yearistype
+ -d $(DESTDIR)$(TZDIR) -l $(LOCALTIME) -p $(POSIXRULES)
+ cp -f iso3166.tab zone.tab $(DESTDIR)$(TZDIR)/.
+ cp zic zdump $(DESTDIR)$(SBINDIR)/.
+@@ -380,11 +380,11 @@
+ $(AWK) -f leapseconds.awk leap-seconds.list >$@
posix_only: zic $(TDATA)
-- $(ZIC) -y $(YEARISTYPE) -d $(TZDIR) -L /dev/null $(TDATA)
-+ $(ZIC_HOST) -y $(YEARISTYPE) -d $(TZDIR) -L /dev/null $(TDATA)
+- $(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR) \
++ $(ZIC_HOST) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR) \
+ -L /dev/null $(TDATA)
right_only: zic leapseconds $(TDATA)
-- $(ZIC) -y $(YEARISTYPE) -d $(TZDIR) -L leapseconds $(TDATA)
-+ $(ZIC_HOST) -y $(YEARISTYPE) -d $(TZDIR) -L leapseconds $(TDATA)
+- $(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR) \
++ $(ZIC_HOST) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR) \
+ -L leapseconds $(TDATA)
# In earlier versions of this makefile, the other two directories were
- # subdirectories of $(TZDIR). However, this led to configuration errors.
-@@ -356,8 +356,8 @@
- # You must replace all of $(TZDIR) to switch from not using leap seconds
+@@ -398,16 +398,16 @@
# to using them, or vice versa.
- other_two: zic leapseconds $(TDATA)
-- $(ZIC) -y $(YEARISTYPE) -d $(TZDIR)/posix -L /dev/null $(TDATA)
-- $(ZIC) -y $(YEARISTYPE) \
-+ $(ZIC_HOST) -y $(YEARISTYPE) -d $(TZDIR)/posix -L /dev/null $(TDATA)
-+ $(ZIC_HOST) -y $(YEARISTYPE) \
- -d $(TZDIR)/right -L leapseconds $(TDATA)
+ right_posix: right_only leapseconds
+ rm -fr $(DESTDIR)$(TZDIR)/right
+- $(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR)/right \
++ $(ZIC_HOST) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR)/right \
+ -L leapseconds $(TDATA)
+- $(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR)/posix \
++ $(ZIC_HOST) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR)/posix \
+ -L /dev/null $(TDATA)
+
+ posix_right: posix_only leapseconds
+ rm -fr $(DESTDIR)$(TZDIR)-posix
+- $(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR)/posix \
++ $(ZIC_HOST) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR)/posix \
+ -L /dev/null $(TDATA)
+- $(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR)/right \
++ $(ZIC_HOST) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR)/right \
+ -L leapseconds $(TDATA)
- posix_right: posix_only other_two
\ No newline at end of file
+ zones: $(REDO)