diff mbox

tzselect: use zonedir instead of current working directory

Message ID 1399804059-29952-1-git-send-email-kerolasa@iki.fi
State New
Headers show

Commit Message

Sami Kerola May 11, 2014, 10:27 a.m. UTC 
Hi Ondrej,

Here's the version with ChangeLog update.

--->8----
From: Sami Kerola <kerolasa@iki.fi>
Date: Sat, 10 May 2014 12:42:44 +0100
Subject: [PATCH] tzselect: use zonedir instead of current working directory

Use in Makefile the same TZDIR regular expression as what is used in tz
project.  This regression was introduced in commit 85bff96 and is part of
glibc-2.19 release.

$ cd /tmp/ && tzselect
/usr/bin/tzselect: line 171: /tmp/iso3166.tab: No such file or directory
/usr/bin/tzselect: time zone files are not set up correctly
---
 ChangeLog         | 5 +++++
 timezone/Makefile | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

Comments

Ondřej Bílka May 13, 2014, 5:40 p.m. UTC | #1 
On Sun, May 11, 2014 at 11:27:39AM +0100, Sami Kerola wrote:
> Hi Ondrej,
> 
> Here's the version with ChangeLog update.
> 
thanks, i commited it
diff mbox

Patch

diff --git a/ChangeLog b/ChangeLog
index 2c08c50..d7dda08 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@ 
+2014-05-10  Sami Kerola  <kerolasa@iki.fi>
+
+	* timezone/Makefile ($(objpfx)tzselect): Use zonedir instead
+	current working directory
+
 2014-05-09  Roland McGrath  <roland@hack.frob.com>
 
 	* sysdeps/arm/armv7/strcmp.S: Use sfi_breg prefix on loads not from sp.
diff --git a/timezone/Makefile b/timezone/Makefile
index 998cd14..d5f647c 100644
--- a/timezone/Makefile
+++ b/timezone/Makefile
@@ -118,7 +118,7 @@  $(testdata)/Asia/Tokyo: asia $(zic-deps)
 
 $(objpfx)tzselect: tzselect.ksh $(common-objpfx)config.make
 	sed -e 's|/bin/bash|$(BASH)|' \
-	    -e '/TZDIR=/s|\$$(pwd)|$(zonedir)|' \
+	    -e 's|TZDIR=[^}]*|TZDIR=$(TZDIR)|' \
 	    -e '/TZVERSION=/s|see_Makefile|"$(version)"|' \
 	    -e '/PKGVERSION=/s|=.*|="$(PKGVERSION)"|' \
 	    -e '/REPORT_BUGS_TO=/s|=.*|="$(REPORT_BUGS_TO)"|' \