From patchwork Fri May 16 04:03:08 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Allan McRae X-Patchwork-Id: 349426 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 162391400A4 for ; Fri, 16 May 2014 14:03:25 +1000 (EST) DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:message-id:date:from:mime-version:to:cc :subject:references:in-reply-to:content-type :content-transfer-encoding; q=dns; s=default; b=yPmTkyovn/z5UUkE DrzKjcHhIjHOIOe5EabIZXJbFmGbRfjP9mtdLmLo0MX2vWvIkNXNi0WjYJml8euM hH5YgWaD627RlVxHxp7tZvZNvrUnkpVIXEZEDo8D4j1Uw6gjnmgP5cxHsVHBC28w rLnLXSG0uWffmyIdCzX4+Cce/LU= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:message-id:date:from:mime-version:to:cc :subject:references:in-reply-to:content-type :content-transfer-encoding; s=default; bh=mCp23DjD1priNGLAMWVqHQ ThCk4=; b=dzns7YI0OVZNjym0VCMM/0gsu//xShhEw+ASz7VuhooDDXYN1GI2s2 f3hXdJKmARFaYmBW0XwY+ojHX5g4MwmYaPq7Mwv0PRTX/QaCiyLSLElkajUnWqIM yt88EV4T84SYxqEAd29QoMMGb2pzPIiYc3LarI0ov7qMqucnw6msQ= Received: (qmail 1521 invoked by alias); 16 May 2014 04:03:19 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 1483 invoked by uid 89); 16 May 2014 04:03:17 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.7 required=5.0 tests=AWL, BAYES_00, RP_MATCHES_RCVD, SPF_PASS autolearn=ham version=3.3.2 X-HELO: gerolde.archlinux.org Message-ID: <53758DFC.90001@archlinux.org> Date: Fri, 16 May 2014 14:03:08 +1000 From: Allan McRae User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.5.0 MIME-Version: 1.0 To: Sami Kerola CC: =?UTF-8?B?T25kxZllaiBCw61sa2E=?= , libc-alpha Subject: Re: [PATCH] tzselect: use zonedir instead of current working directory References: <1399716175-898-1-git-send-email-kerolasa@iki.fi> <536DFB37.6030203@archlinux.org> <1399722730-3465-1-git-send-email-kerolasa@iki.fi> <20140510165438.GA11500@domone> <1399804059-29952-1-git-send-email-kerolasa@iki.fi> <20140513174042.GA14198@domone.podge> In-Reply-To: <20140513174042.GA14198@domone.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 + + * timezone/Makefile ($(objpfx)tzselect): Use correct variable + in sed expression. + 2014-05-16 Aurelien Jarno [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)"|' \