X-Git-Url: http://gitweb/?a=blobdiff_plain;f=tzdata%2Ftzcode-makefile.patch;h=c47f50820ab231b8938fcba0587cd5d084e3aee7;hb=3ec50173fbb253e15f3306db8c9ae5ce8d75176e;hp=1c964c180adb28114f1c53c42204c23d3d1def01;hpb=fcacfef8b1865526968a771838d4c3f70808c2e0;p=crossrootfs.git diff --git a/tzdata/tzcode-makefile.patch b/tzdata/tzcode-makefile.patch index 1c964c1..c47f508 100644 --- a/tzdata/tzcode-makefile.patch +++ b/tzdata/tzcode-makefile.patch @@ -10,9 +10,9 @@ diff -Nru tzcode.orig/Makefile tzcode/Makefile ---- tzcode.orig/Makefile 2013-12-21 14:05:52.169527862 +0100 -+++ tzcode/Makefile 2013-12-21 14:06:05.299054045 +0100 -@@ -45,21 +45,21 @@ +--- tzcode.orig/Makefile 2015-08-12 11:00:16.696813835 +0200 ++++ tzcode/Makefile 2015-08-12 11:00:45.296792265 +0200 +@@ -44,21 +44,21 @@ # Everything gets put in subdirectories of. . . @@ -37,9 +37,9 @@ diff -Nru tzcode.orig/Makefile tzcode/Makefile # If you "make INSTALL", the "date" command gets installed in. . . -@@ -290,8 +290,10 @@ +@@ -320,8 +320,10 @@ - ############################################################################### + #MAKE= make -cc= cc -CC= $(cc) -DTZDIR=\"$(TZDIR)\" @@ -50,8 +50,8 @@ diff -Nru tzcode.orig/Makefile tzcode/Makefile AR= ar -@@ -341,19 +343,18 @@ - ALL: all date +@@ -371,19 +373,18 @@ + ALL: all date $(ENCHILADA) install: all $(DATA) $(REDO) $(MANS) - mkdir -p $(DESTDIR)$(ETCDIR) $(DESTDIR)$(TZDIR) \ @@ -62,7 +62,7 @@ diff -Nru tzcode.orig/Makefile tzcode/Makefile $(DESTDIR)$(MANDIR)/man8 $(ZIC) -y $(YEARISTYPE) \ -d $(DESTDIR)$(TZDIR) -l $(LOCALTIME) -p $(POSIXRULES) - cp -f iso3166.tab zone.tab $(DESTDIR)$(TZDIR)/. + cp -f iso3166.tab $(ZONETABLES) $(DESTDIR)$(TZDIR)/. - cp tzselect zic zdump $(DESTDIR)$(ETCDIR)/. + cp zic zdump $(DESTDIR)$(SBINDIR)/. + cp tzselect $(DESTDIR)$(BINDIR)/. @@ -74,7 +74,7 @@ diff -Nru tzcode.orig/Makefile tzcode/Makefile INSTALL: ALL install date.1 mkdir -p $(DESTDIR)$(BINDIR) $(DESTDIR)$(MANDIR)/man1 -@@ -396,19 +397,17 @@ +@@ -426,19 +427,17 @@ # You must replace all of $(TZDIR) to switch from not using leap seconds # to using them, or vice versa. right_posix: right_only leapseconds @@ -98,13 +98,13 @@ diff -Nru tzcode.orig/Makefile tzcode/Makefile + $(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR)/right \ -L leapseconds $(TDATA) - zones: $(REDO) -@@ -431,7 +430,7 @@ - <$? >$@ + posix_packrat: posix_only backzone +@@ -467,7 +466,7 @@ chmod +x $@ --check: check_character_set check_tables check_web -+check: check_character_set check_tables + check: check_character_set check_white_space check_links check_sorted \ +- check_tables check_web ++ check_tables check_character_set: $(ENCHILADA) - sharp='#'; ! grep -n $(INVALID_CHAR) $(ENCHILADA) + LC_ALL=en_US.utf8 && export LC_ALL && \