tzselect: stop requiring ksh

This script works fine under bash (which we already require), so drop
the legacy ksh munging.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>

diff --git a/ChangeLog b/ChangeLog
index c01216737980f9fc7b6fe1fa6a7bfacd3acab3a8..6aaca4251a48d2d677edfc8d5e09dc3e11be25f5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2014-02-08  Mike Frysinger  <vapier@gentoo.org>
+
+       * timezone/Makefile: Delete $(have-ksh) check.
+       ($(objpfx)tzselect): Change $(KSH) to $(BASH).
+       * timezone/tzselect.ksh: Add +x mode bits.
+
 2014-02-08  Mike Frysinger  <vapier@gentoo.org>
 
        * sysdeps/unix/sysv/linux/linux_fsinfo.h (AFS_SUPER_MAGIC): Define.

diff --git a/timezone/Makefile b/timezone/Makefile
index f5fb4241e0027a6b777233dda0421bd3b7076551..6c640fd1447fd9d680d47f54c0d655700e38cec3 100644 (file)
--- 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 (file)
new mode 100755 (executable)