This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
Re: [PATCH] tzselect: use zonedir instead of current working directory
- From: Allan McRae <allan at archlinux dot org>
- To: Sami Kerola <kerolasa at iki dot fi>
- Cc: OndÅej BÃlka <neleai at seznam dot cz>, libc-alpha <libc-alpha at sourceware dot org>
- Date: Fri, 16 May 2014 14:03:08 +1000
- Subject: Re: [PATCH] tzselect: use zonedir instead of current working directory
- Authentication-results: sourceware.org; auth=none
- References: <1399716175-898-1-git-send-email-kerolasa at iki dot fi> <536DFB37 dot 6030203 at archlinux dot org> <1399722730-3465-1-git-send-email-kerolasa at iki dot fi> <20140510165438 dot GA11500 at domone> <1399804059-29952-1-git-send-email-kerolasa at iki dot fi> <20140513174042 dot GA14198 at domone dot podge>
On 14/05/14 03:40, OndÅej BÃlka wrote:
> 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
>
Well... this patch was broken. Committed the following fix as obvious:
diff --git a/ChangeLog b/ChangeLog
index 09a7f7d..4161750 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2014-05-16 Allan McRae <allan@archlinux.org>
+
+ * timezone/Makefile ($(objpfx)tzselect): Use correct variable
+ in sed expression.
+
2014-05-16 Aurelien Jarno <aurelien@aurel32.net>
[BZ #16917]
diff --git a/timezone/Makefile b/timezone/Makefile
index d5f647c..0aef202 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 's|TZDIR=[^}]*|TZDIR=$(TZDIR)|' \
+ -e 's|TZDIR=[^}]*|TZDIR=$(zonedir)|' \
-e '/TZVERSION=/s|see_Makefile|"$(version)"|' \
-e '/PKGVERSION=/s|=.*|="$(PKGVERSION)"|' \
-e '/REPORT_BUGS_TO=/s|=.*|="$(REPORT_BUGS_TO)"|' \