mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2026-01-07 17:52:10 +01:00
100 lines
3.1 KiB
Diff
100 lines
3.1 KiB
Diff
--- ./Makefile.orig 2013-10-25 22:34:35.000000000 +0000
|
|
+++ ./Makefile 2013-10-29 07:15:04.554083434 +0000
|
|
@@ -45,21 +45,21 @@
|
|
|
|
# Everything gets put in subdirectories of. . .
|
|
|
|
-TOPDIR= /usr/local
|
|
+TOPDIR= /usr
|
|
|
|
# "Compiled" time zone information is placed in the "TZDIR" directory
|
|
# (and subdirectories).
|
|
# Use an absolute path name for TZDIR unless you're just testing the software.
|
|
|
|
TZDIR_BASENAME= zoneinfo
|
|
-TZDIR= $(TOPDIR)/etc/$(TZDIR_BASENAME)
|
|
+TZDIR= $(TOPDIR)/share/$(TZDIR_BASENAME)
|
|
|
|
# Types to try, as an alternative to time_t. int64_t should be first.
|
|
TIME_T_ALTERNATIVES= int64_t int32_t uint32_t uint64_t
|
|
|
|
# The "tzselect", "zic", and "zdump" commands get installed in. . .
|
|
|
|
-ETCDIR= $(TOPDIR)/etc
|
|
+SBINDIR= $(TOPDIR)/sbin
|
|
|
|
# If you "make INSTALL", the "date" command gets installed in. . .
|
|
|
|
@@ -67,7 +67,7 @@
|
|
|
|
# Manual pages go in subdirectories of. . .
|
|
|
|
-MANDIR= $(TOPDIR)/man
|
|
+MANDIR= $(TOPDIR)/share/man
|
|
|
|
# Library functions are put in an archive in LIBDIR.
|
|
|
|
@@ -298,8 +298,10 @@
|
|
|
|
###############################################################################
|
|
|
|
-cc= cc
|
|
-CC= $(cc) -DTZDIR=\"$(TZDIR)\"
|
|
+CC+= -DTZDIR=\"$(TZDIR)\"
|
|
+ifeq ($(NLS),1)
|
|
+CC+= -DHAVE_GETTEXT=1 -DTZ_DOMAIN=\"libc\"
|
|
+endif
|
|
|
|
AR= ar
|
|
|
|
@@ -352,12 +354,14 @@
|
|
install: all $(DATA) $(REDO) $(MANS)
|
|
mkdir -p $(DESTDIR)$(ETCDIR) $(DESTDIR)$(TZDIR) \
|
|
$(DESTDIR)$(LIBDIR) \
|
|
+ $(DESTDIR)$(SBINDIR) $(DESTDIR)$(BINDIR) \
|
|
$(DESTDIR)$(MANDIR)/man3 $(DESTDIR)$(MANDIR)/man5 \
|
|
$(DESTDIR)$(MANDIR)/man8
|
|
$(ZIC) -y $(YEARISTYPE) \
|
|
-d $(DESTDIR)$(TZDIR) -l $(LOCALTIME) -p $(POSIXRULES)
|
|
cp -f iso3166.tab zone.tab $(DESTDIR)$(TZDIR)/.
|
|
- cp tzselect zic zdump $(DESTDIR)$(ETCDIR)/.
|
|
+ cp zic zdump $(DESTDIR)$(SBINDIR)/.
|
|
+ cp tzselect $(DESTDIR)$(BINDIR)/.
|
|
cp libtz.a $(DESTDIR)$(LIBDIR)/.
|
|
$(RANLIB) $(DESTDIR)$(LIBDIR)/libtz.a
|
|
cp -f newctime.3 newtzset.3 $(DESTDIR)$(MANDIR)/man3/.
|
|
@@ -406,18 +410,18 @@
|
|
# to using them, or vice versa.
|
|
right_posix: right_only leapseconds
|
|
rm -fr $(DESTDIR)$(TZDIR)-leaps
|
|
- ln -s $(TZDIR_BASENAME) $(DESTDIR)$(TZDIR)-leaps || \
|
|
- $(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR)-leaps \
|
|
+ ln -s . $(DESTDIR)$(TZDIR)/right || \
|
|
+ $(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR)/right \
|
|
-L leapseconds $(TDATA)
|
|
- $(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR)-posix \
|
|
+ $(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR)/posix \
|
|
-L /dev/null $(TDATA)
|
|
|
|
posix_right: posix_only leapseconds
|
|
rm -fr $(DESTDIR)$(TZDIR)-posix
|
|
- ln -s $(TZDIR_BASENAME) $(DESTDIR)$(TZDIR)-posix || \
|
|
- $(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR)-posix \
|
|
+ ln -s . $(DESTDIR)$(TZDIR)/posix || \
|
|
+ $(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR)/posix \
|
|
-L /dev/null $(TDATA)
|
|
- $(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR)-leaps \
|
|
+ $(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR)/right \
|
|
-L leapseconds $(TDATA)
|
|
|
|
zones: $(REDO)
|
|
@@ -440,7 +444,7 @@
|
|
<$? >$@
|
|
chmod +x $@
|
|
|
|
-check: check_character_set check_tables check_web
|
|
+check: check_character_set check_tables
|
|
|
|
check_character_set: $(ENCHILADA)
|
|
sharp='#'; ! grep -n $(INVALID_CHAR) $(ENCHILADA)
|