development / crossrootfs.git / blame
| Commit | Line | Data |
|---|---|---|
| fcacfef8 VM |
1 | --- Makefile.orig 2014-10-01 15:40:50.900427432 +0000 |
| 2 | +++ Makefile 2014-10-01 15:42:37.400428739 +0000 | |
| 3 | @@ -231,8 +231,8 @@ | |
| 4 | ||
| 5 | LDFLAGS= $(LFLAGS) | |
| 6214a1c8 VM |
6 | |
| 7 | -zic= ./zic | |
| 8 | -ZIC= $(zic) $(ZFLAGS) | |
| 9 | +ZIC_HOST= ./zic_host | |
| 10 | +ZIC= $(ZIC_HOST) $(ZFLAGS) | |
| 11 | ||
| fcacfef8 | 12 | ZFLAGS= |
| 6214a1c8 | 13 | |
| fcacfef8 VM |
14 | @@ -347,7 +347,7 @@ |
| 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 VM |
20 | -d $(DESTDIR)$(TZDIR) -l $(LOCALTIME) -p $(POSIXRULES) |
| 21 | cp -f iso3166.tab zone.tab $(DESTDIR)$(TZDIR)/. | |
| 22 | cp zic zdump $(DESTDIR)$(SBINDIR)/. | |
| 23 | @@ -380,11 +380,11 @@ | |
| 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 | |
| fcacfef8 | 37 | @@ -398,16 +398,16 @@ |
| 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 | |
| fcacfef8 | 57 | zones: $(REDO) |