Commit | Line | Data |
---|---|---|
747522c9 VM |
1 | --- Makefile.orig 2012-10-15 16:32:13.248683438 +0000 |
2 | +++ Makefile 2012-10-15 16:33:33.324686164 +0000 | |
3 | @@ -219,8 +219,8 @@ | |
4 | # If you want zic's -s option used when installing, uncomment the next line | |
5 | # ZFLAGS= -s | |
6 | ||
7 | -zic= ./zic | |
8 | -ZIC= $(zic) $(ZFLAGS) | |
9 | +ZIC_HOST= ./zic_host | |
10 | +ZIC= $(ZIC_HOST) $(ZFLAGS) | |
11 | ||
12 | # The name of a Posix-compliant `awk' on your system. | |
13 | AWK= awk | |
14 | @@ -301,7 +301,7 @@ | |
15 | ALL: all date | |
16 | ||
17 | install: all $(DATA) $(REDO) $(MANS) $(TABDATA) | |
18 | - $(ZIC) -y $(YEARISTYPE) \ | |
19 | + $(ZIC_HOST) -y $(YEARISTYPE) \ | |
20 | -d $(TZDIR) -l $(LOCALTIME) -p $(POSIXRULES) | |
21 | -rm -f $(TZDIR)/iso3166.tab $(TZDIR)/zone.tab | |
22 | cp iso3166.tab zone.tab $(TZDIR)/. | |
23 | @@ -341,10 +341,10 @@ | |
24 | chmod +x yearistype | |
25 | ||
26 | posix_only: zic $(TDATA) | |
27 | - $(ZIC) -y $(YEARISTYPE) -d $(TZDIR) -L /dev/null $(TDATA) | |
28 | + $(ZIC_HOST) -y $(YEARISTYPE) -d $(TZDIR) -L /dev/null $(TDATA) | |
29 | ||
30 | right_only: zic leapseconds $(TDATA) | |
31 | - $(ZIC) -y $(YEARISTYPE) -d $(TZDIR) -L leapseconds $(TDATA) | |
32 | + $(ZIC_HOST) -y $(YEARISTYPE) -d $(TZDIR) -L leapseconds $(TDATA) | |
33 | ||
34 | # In earlier versions of this makefile, the other two directories were | |
35 | # subdirectories of $(TZDIR). However, this led to configuration errors. | |
36 | @@ -356,8 +356,8 @@ | |
37 | # You must replace all of $(TZDIR) to switch from not using leap seconds | |
38 | # to using them, or vice versa. | |
39 | other_two: zic leapseconds $(TDATA) | |
40 | - $(ZIC) -y $(YEARISTYPE) -d $(TZDIR)/posix -L /dev/null $(TDATA) | |
41 | - $(ZIC) -y $(YEARISTYPE) \ | |
42 | + $(ZIC_HOST) -y $(YEARISTYPE) -d $(TZDIR)/posix -L /dev/null $(TDATA) | |
43 | + $(ZIC_HOST) -y $(YEARISTYPE) \ | |
44 | -d $(TZDIR)/right -L leapseconds $(TDATA) | |
45 | ||
46 | posix_right: posix_only other_two |