aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2014-01-25 00:16:49 -0500
committerMike Frysinger <vapier@gentoo.org>2014-02-08 06:47:58 -0500
commit73f79bb7e7e518a912df938613da6268316c17ed (patch)
treea20435c5b0c32deef20364a76ed693e402ba96ed
parent8da79b60ae2242b07a760c073ff79612d8b5864e (diff)
downloadglibc-73f79bb7e7e518a912df938613da6268316c17ed.zip
glibc-73f79bb7e7e518a912df938613da6268316c17ed.tar.gz
glibc-73f79bb7e7e518a912df938613da6268316c17ed.tar.bz2
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>
-rw-r--r--ChangeLog6
-rw-r--r--timezone/Makefile4
-rwxr-xr-x[-rw-r--r--]timezone/tzselect.ksh0
3 files changed, 7 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index c012167..6aaca42 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
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.
(ANON_INODE_FS_MAGIC): Likewise.
(BDEVFS_MAGIC): Likewise.
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
index 9d70691..9d70691 100644..100755
--- a/timezone/tzselect.ksh
+++ b/timezone/tzselect.ksh