tzselect: use zonedir instead of current working directory
Commit Message
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:
@@ -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]
@@ -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)"|' \