[PATCH] Re: tzselect: use zonedir instead of current working directory

[Sami Kerola]

> Shouldn't we adjust the Makefile as the tzselect.ksh file is taken
> directly from tzcode?

Hi Allan,

Good point.  The below change further aligns these two projects.


--->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
---
 timezone/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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)"|' \
-- 
1.9.2