development / crossrootfs.git / blame
| Commit | Line | Data |
|---|---|---|
| 6c4f6dc5 VM |
1 | --- Makefile.orig 2015-11-16 11:06:13.302320678 +0000 |
| 2 | +++ Makefile 2015-11-16 11:07:23.232321567 +0000 | |
| 3 | @@ -236,8 +236,8 @@ | |
| fcacfef8 VM |
4 | |
| 5 | LDFLAGS= $(LFLAGS) | |
| 6214a1c8 VM |
6 | |
| 7 | -zic= ./zic | |
| 8 | -ZIC= $(zic) $(ZFLAGS) | |
| 6c4f6dc5 VM |
9 | +zic= ./zic_host |
| 10 | +ZIC_HOST= $(zic) $(ZFLAGS) | |
| 6214a1c8 | 11 | |
| fcacfef8 | 12 | ZFLAGS= |
| 6214a1c8 | 13 | |
| 6c4f6dc5 | 14 | @@ -377,7 +377,7 @@ |
| fcacfef8 VM |
15 | $(DESTDIR)$(LIBDIR) $(DESTDIR)$(BINDIR) \ |
| 16 | $(DESTDIR)$(MANDIR)/man3 $(DESTDIR)$(MANDIR)/man5 \ | |
| 17 | $(DESTDIR)$(MANDIR)/man8 | |
| 6214a1c8 VM |
18 | - $(ZIC) -y $(YEARISTYPE) \ |
| 19 | + $(ZIC_HOST) -y $(YEARISTYPE) \ | |
| fcacfef8 | 20 | -d $(DESTDIR)$(TZDIR) -l $(LOCALTIME) -p $(POSIXRULES) |
| 6c4f6dc5 | 21 | cp -f iso3166.tab $(ZONETABLES) $(DESTDIR)$(TZDIR)/. |
| fcacfef8 | 22 | cp zic zdump $(DESTDIR)$(SBINDIR)/. |
| 6c4f6dc5 | 23 | @@ -410,11 +410,11 @@ |
| fcacfef8 | 24 | $(AWK) -f leapseconds.awk leap-seconds.list >$@ |
| 6214a1c8 VM |
25 | |
| 26 | posix_only: zic $(TDATA) | |
| fcacfef8 VM |
27 | - $(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR) \ |
| 28 | + $(ZIC_HOST) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR) \ | |
| 29 | -L /dev/null $(TDATA) | |
| 6214a1c8 VM |
30 | |
| 31 | right_only: zic leapseconds $(TDATA) | |
| fcacfef8 VM |
32 | - $(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR) \ |
| 33 | + $(ZIC_HOST) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR) \ | |
| 34 | -L leapseconds $(TDATA) | |
| 6214a1c8 VM |
35 | |
| 36 | # In earlier versions of this makefile, the other two directories were | |
| 6c4f6dc5 | 37 | @@ -428,21 +428,21 @@ |
| 6214a1c8 | 38 | # to using them, or vice versa. |
| fcacfef8 VM |
39 | right_posix: right_only leapseconds |
| 40 | rm -fr $(DESTDIR)$(TZDIR)/right | |
| 41 | - $(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR)/right \ | |
| 42 | + $(ZIC_HOST) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR)/right \ | |
| 43 | -L leapseconds $(TDATA) | |
| 44 | - $(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR)/posix \ | |
| 45 | + $(ZIC_HOST) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR)/posix \ | |
| 46 | -L /dev/null $(TDATA) | |
| 47 | ||
| 48 | posix_right: posix_only leapseconds | |
| 49 | rm -fr $(DESTDIR)$(TZDIR)-posix | |
| 50 | - $(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR)/posix \ | |
| 51 | + $(ZIC_HOST) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR)/posix \ | |
| 52 | -L /dev/null $(TDATA) | |
| 53 | - $(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR)/right \ | |
| 54 | + $(ZIC_HOST) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR)/right \ | |
| 55 | -L leapseconds $(TDATA) | |
| 6214a1c8 | 56 | |
| 6c4f6dc5 VM |
57 | posix_packrat: posix_only backzone |
| 58 | $(AWK) '/^Rule/' $(TDATA) | \ | |
| 59 | - $(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR) \ | |
| 60 | + $(ZIC_HOST) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR) \ | |
| 61 | -L /dev/null - backzone | |
| 62 | ||
| fcacfef8 | 63 | zones: $(REDO) |