This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
[PATCH 1/4] tzselect: stop requiring ksh
- From: Mike Frysinger <vapier at gentoo dot org>
- To: libc-alpha at sourceware dot org
- Date: Sat, 25 Jan 2014 05:09:37 -0500
- Subject: [PATCH 1/4] tzselect: stop requiring ksh
- Authentication-results: sourceware.org; auth=none
This script works fine under bash (which we already require), so drop
the legacy ksh munging.
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
2014-01-23 Mike Frysinger <vapier@gentoo.org>
* timezone/Makefile: Delete $(have-ksh) check.
($(objpfx)tzselect): Change $(KSH) to $(BASH).
* timezone/tzselect.ksh: Add +x mode bits.
---
timezone/Makefile | 4 +---
timezone/tzselect.ksh | 0
2 files changed, 1 insertion(+), 3 deletions(-)
mode change 100644 => 100755 timezone/tzselect.ksh
diff --git a/timezone/Makefile b/timezone/Makefile
index f5fb424..6c640fd 100644
--- a/timezone/Makefile
+++ b/timezone/Makefile
@@ -44,10 +44,8 @@ include ../Makeconfig # Get objpfx defined so we can use it below.
CPPFLAGS-zic = -DNOT_IN_libc
-ifeq ($(have-ksh),yes)
install-bin-script = tzselect
generated += tzselect
-endif
include ../Rules
@@ -113,7 +111,7 @@ $(testdata)/Asia/Tokyo: asia $(zic-deps)
$(objpfx)tzselect: tzselect.ksh $(common-objpfx)config.make
- sed -e 's|/bin/bash|$(KSH)|g' \
+ sed -e 's|/bin/bash|$(BASH)|' \
-e '/TZDIR=/s|\$$(pwd)|$(zonedir)|' \
-e '/TZVERSION=/s|see_Makefile|"$(version)"|' \
-e '/PKGVERSION=/s|=.*|="$(PKGVERSION)"|' \
diff --git a/timezone/tzselect.ksh b/timezone/tzselect.ksh
old mode 100644
new mode 100755
--
1.8.5.3