Browse Source

tzdata: fixed/rediffed destdir.patch which should have been done with last update

user/chris/wip/linux37
Christian Wiese 12 years ago
parent
commit
4a5182d79c
  1. 26
      base/tzdata/destdir.patch

26
base/tzdata/destdir.patch

@ -2,7 +2,7 @@
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../tzdata/destdir.patch
# Copyright (C) 2008 The OpenSDE Project
# Copyright (C) 2008 - 2012 The OpenSDE Project
#
# More information can be found in the files COPYING and README.
#
@ -14,9 +14,9 @@
# version.
# --- SDE-COPYRIGHT-NOTE-END ---
--- ./Makefile.orig 2007-12-27 17:14:21.000000000 +0000
+++ ./Makefile 2008-01-31 03:19:05.000000000 +0000
@@ -242,6 +242,7 @@
--- ./Makefile.orig 2012-11-13 03:34:49.000000000 +0100
+++ ./Makefile 2012-12-26 11:31:32.025712966 +0100
@@ -277,6 +277,7 @@
cc= cc
CC= $(cc) -DTZDIR=\"$(TZDIR)\"
@ -24,7 +24,7 @@
TZCSRCS= zic.c localtime.c asctime.c scheck.c ialloc.c
TZCOBJS= zic.o localtime.o asctime.o scheck.o ialloc.o
TZDSRCS= zdump.c localtime.c ialloc.c
@@ -282,29 +283,30 @@
@@ -318,29 +319,30 @@
install: all $(DATA) $(REDO) $(TZLIB) $(MANS) $(TABDATA)
$(ZIC) -y $(YEARISTYPE) \
@ -74,9 +74,9 @@
+ -rm -f $(DESTDIR)$(MANDIR)/man1/date.1
+ cp date.1 $(DESTDIR)$(MANDIR)/man1/.
zdump: $(TZDOBJS)
$(CC) $(CFLAGS) $(LFLAGS) $(TZDOBJS) $(LDLIBS) -o $@
@@ -317,10 +319,10 @@
version.h:
(echo 'static char const PKGVERSION[]="($(PACKAGE)) ";' && \
@@ -357,10 +359,10 @@
chmod +x yearistype
posix_only: zic $(TDATA)
@ -89,7 +89,7 @@
# In earlier versions of this makefile, the other two directories were
# subdirectories of $(TZDIR). However, this led to configuration errors.
@@ -332,9 +334,9 @@
@@ -372,9 +374,9 @@
# You must replace all of $(TZDIR) to switch from not using leap seconds
# to using them, or vice versa.
other_two: zic leapseconds $(TDATA)
@ -101,7 +101,7 @@
posix_right: posix_only other_two
@@ -343,10 +345,10 @@
@@ -383,10 +385,10 @@
zones: $(REDO)
$(TZLIB): $(LIBOBJS)
@ -109,9 +109,9 @@
- ar ru $@ $(LIBOBJS)
+ -mkdir $(DESTDIR)$(TOPDIR) $(DESTDIR)$(LIBDIR)
+ ar ru $(DESTDIR)$@ $(LIBOBJS)
if [ -x /usr/ucb/ranlib -o -x /usr/bin/ranlib ] ; \
if [ -x /usr/ucb/ranlib ] || [ -x /usr/bin/ranlib ]; \
- then ranlib $@ ; fi
+ then $(RANLIB) $(DESTDIR)$@ ; fi
# We use the system's logwtmp in preference to ours if available.
date: $(DATEOBJS)
$(CC) -o $@ $(CFLAGS) $(LDFLAGS) $(DATEOBJS) $(LDLIBS)

Loading…
Cancel
Save