diff options
| author | Sami Kerola <kerolasa@iki.fi> | 2014-05-13 19:38:32 +0200 |
|---|---|---|
| committer | Allan McRae <allan@archlinux.org> | 2014-05-16 14:49:26 +1000 |
| commit | 1f2d5b7d006bb5a85538750328dee160058cdbca (patch) | |
| tree | ddb529812601dc65bee55f7ddc0a76569d1c6471 | |
| parent | e089a3966d881959aefddecde2afeb727f9cd5cf (diff) | |
| download | glibc-1f2d5b7d006bb5a85538750328dee160058cdbca.tar.gz | |
tzselect: use zonedir instead of current working directory
(cherry picked from commit 893b4f375668c025cbd6828f82a8844edda276d1)
(cherry picked from commit c72399fbc5228580a560d8fe319ff98150928b05)
Conflicts:
timezone/Makefile
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | timezone/Makefile | 2 |
2 files changed, 6 insertions, 1 deletions
@@ -1,3 +1,8 @@ +2014-05-13 Sami Kerola <kerolasa@iki.fi> + + * timezone/Makefile ($(objpfx)tzselect): Use zonedir instead + current working directory + 2014-05-16 Allan McRae <allan@archlinux.org> * po/sv.po: Update Swedish translation from translation project. diff --git a/timezone/Makefile b/timezone/Makefile index f5fb4241e0..58e7f507b1 100644 --- a/timezone/Makefile +++ b/timezone/Makefile @@ -114,7 +114,7 @@ $(testdata)/Asia/Tokyo: asia $(zic-deps) $(objpfx)tzselect: tzselect.ksh $(common-objpfx)config.make sed -e 's|/bin/bash|$(KSH)|g' \ - -e '/TZDIR=/s|\$$(pwd)|$(zonedir)|' \ + -e 's|TZDIR=[^}]*|TZDIR=$(zonedir)|' \ -e '/TZVERSION=/s|see_Makefile|"$(version)"|' \ -e '/PKGVERSION=/s|=.*|="$(PKGVERSION)"|' \ -e '/REPORT_BUGS_TO=/s|=.*|="$(REPORT_BUGS_TO)"|' \ |