| 1 | # http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/sys-libs/timezone-data/files/timezone-data-2012a-makefile.patch |
| 2 | |
| 3 | diff -Nru tzcode.orig/Makefile tzcode/Makefile |
| 4 | --- tzcode.orig/Makefile 2012-09-13 10:25:47.698561812 +0200 |
| 5 | +++ tzcode/Makefile 2012-09-13 10:31:12.070115537 +0200 |
| 6 | @@ -39,17 +39,17 @@ |
| 7 | |
| 8 | # Everything gets put in subdirectories of. . . |
| 9 | |
| 10 | -TOPDIR= /usr/local |
| 11 | +TOPDIR= $(DESTDIR)/usr |
| 12 | |
| 13 | # "Compiled" time zone information is placed in the "TZDIR" directory |
| 14 | # (and subdirectories). |
| 15 | # Use an absolute path name for TZDIR unless you're just testing the software. |
| 16 | |
| 17 | -TZDIR= $(TOPDIR)/etc/zoneinfo |
| 18 | +TZDIR= $(TOPDIR)/share/zoneinfo |
| 19 | |
| 20 | # The "tzselect", "zic", and "zdump" commands get installed in. . . |
| 21 | |
| 22 | -ETCDIR= $(TOPDIR)/etc |
| 23 | +SBINDIR= $(TOPDIR)/sbin |
| 24 | |
| 25 | # If you "make INSTALL", the "date" command gets installed in. . . |
| 26 | |
| 27 | @@ -223,7 +223,7 @@ |
| 28 | ZIC= $(zic) $(ZFLAGS) |
| 29 | |
| 30 | # The name of a Posix-compliant `awk' on your system. |
| 31 | -AWK= nawk |
| 32 | +AWK= awk |
| 33 | |
| 34 | # The path where SGML DTDs are kept. |
| 35 | # The default is appropriate for Ubuntu. |
| 36 | @@ -257,8 +257,10 @@ |
| 37 | |
| 38 | ############################################################################### |
| 39 | |
| 40 | -cc= cc |
| 41 | -CC= $(cc) -DTZDIR=\"$(TZDIR)\" |
| 42 | +CC+= -DTZDIR=\"$(TZDIR)\" |
| 43 | +ifeq ($(NLS),1) |
| 44 | +CC += -DHAVE_GETTEXT=1 -DTZ_DOMAIN=\"libc\" |
| 45 | +endif |
| 46 | |
| 47 | TZCSRCS= zic.c localtime.c asctime.c scheck.c ialloc.c |
| 48 | TZCOBJS= zic.o localtime.o asctime.o scheck.o ialloc.o |
| 49 | @@ -298,13 +300,15 @@ |
| 50 | |
| 51 | ALL: all date |
| 52 | |
| 53 | -install: all $(DATA) $(REDO) $(TZLIB) $(MANS) $(TABDATA) |
| 54 | +install: all $(DATA) $(REDO) $(MANS) $(TABDATA) |
| 55 | $(ZIC) -y $(YEARISTYPE) \ |
| 56 | -d $(TZDIR) -l $(LOCALTIME) -p $(POSIXRULES) |
| 57 | -rm -f $(TZDIR)/iso3166.tab $(TZDIR)/zone.tab |
| 58 | cp iso3166.tab zone.tab $(TZDIR)/. |
| 59 | - -mkdir $(TOPDIR) $(ETCDIR) |
| 60 | - cp tzselect zic zdump $(ETCDIR)/. |
| 61 | + -mkdir $(TOPDIR) $(SBINDIR) |
| 62 | + cp zic zdump $(SBINDIR)/. |
| 63 | + -mkdir $(TOPDIR) $(BINDIR) |
| 64 | + cp tzselect $(BINDIR)/. |
| 65 | -mkdir $(TOPDIR) $(MANDIR) \ |
| 66 | $(MANDIR)/man3 $(MANDIR)/man5 $(MANDIR)/man8 |
| 67 | -rm -f $(MANDIR)/man3/newctime.3 \ |
| 68 | @@ -314,8 +318,6 @@ |
| 69 | $(MANDIR)/man8/zdump.8 \ |
| 70 | $(MANDIR)/man8/zic.8 |
| 71 | cp newctime.3 newtzset.3 $(MANDIR)/man3/. |
| 72 | - cp tzfile.5 $(MANDIR)/man5/. |
| 73 | - cp tzselect.8 zdump.8 zic.8 $(MANDIR)/man8/. |
| 74 | |
| 75 | INSTALL: ALL install date.1 |
| 76 | -mkdir $(TOPDIR) $(BINDIR) |
| 77 | @@ -329,10 +331,10 @@ |
| 78 | 'static char const TZVERSION[]="tz$(VERSION)";' |
| 79 | |
| 80 | zdump: $(TZDOBJS) |
| 81 | - $(CC) $(CFLAGS) $(LFLAGS) $(TZDOBJS) $(LDLIBS) -o $@ |
| 82 | + $(CC) $(CFLAGS) $(LDFLAGS) $(TZDOBJS) $(LDLIBS) -o $@ |
| 83 | |
| 84 | zic: $(TZCOBJS) yearistype |
| 85 | - $(CC) $(CFLAGS) $(LFLAGS) $(TZCOBJS) $(LDLIBS) -o $@ |
| 86 | + $(CC) $(CFLAGS) $(LDFLAGS) $(TZCOBJS) $(LDLIBS) -o $@ |
| 87 | |
| 88 | yearistype: yearistype.sh |
| 89 | cp yearistype.sh yearistype |
| 90 | @@ -354,9 +356,9 @@ |
| 91 | # You must replace all of $(TZDIR) to switch from not using leap seconds |
| 92 | # to using them, or vice versa. |
| 93 | other_two: zic leapseconds $(TDATA) |
| 94 | - $(ZIC) -y $(YEARISTYPE) -d $(TZDIR)-posix -L /dev/null $(TDATA) |
| 95 | + $(ZIC) -y $(YEARISTYPE) -d $(TZDIR)/posix -L /dev/null $(TDATA) |
| 96 | $(ZIC) -y $(YEARISTYPE) \ |
| 97 | - -d $(TZDIR)-leaps -L leapseconds $(TDATA) |
| 98 | + -d $(TZDIR)/right -L leapseconds $(TDATA) |
| 99 | |
| 100 | posix_right: posix_only other_two |
| 101 | |
| 102 | @@ -371,7 +373,7 @@ |
| 103 | then ranlib $@ ; fi |
| 104 | |
| 105 | date: $(DATEOBJS) |
| 106 | - $(CC) $(CFLAGS) date.o localtime.o asctime.o strftime.o \ |
| 107 | + $(CC) $(CFLAGS) $(LDFLAGS) date.o localtime.o asctime.o strftime.o \ |
| 108 | $(LDLIBS) -lc -o $@ |
| 109 | |
| 110 | tzselect: tzselect.ksh |
| 111 | @@ -382,7 +384,7 @@ |
| 112 | <$? >$@ |
| 113 | chmod +x $@ |
| 114 | |
| 115 | -check: check_tables check_web |
| 116 | +check: check_tables |
| 117 | |
| 118 | check_tables: checktab.awk $(PRIMARY_YDATA) |
| 119 | $(AWK) -f checktab.awk $(PRIMARY_YDATA) |
| 120 | diff -Nru tzcode.orig/tzselect.ksh tzcode/tzselect.ksh |
| 121 | --- tzcode.orig/tzselect.ksh 2012-09-13 10:25:47.698561812 +0200 |
| 122 | +++ tzcode/tzselect.ksh 2012-09-13 10:26:06.107893321 +0200 |
| 123 | @@ -1,4 +1,4 @@ |
| 124 | -#! /bin/ksh |
| 125 | +#! /bin/bash |
| 126 | |
| 127 | TZVERSION=see_Makefile |
| 128 | |