AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-01-03 08:11:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

tzselect: stop requiring ksh

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

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
This commit is contained in:
Mike Frysinger 2014-01-25 00:16:49 -05:00
parent 8da79b60ae
commit 73f79bb7e7
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -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> 2014-02-08 Mike Frysinger <vapier@gentoo.org>
* sysdeps/unix/sysv/linux/linux_fsinfo.h (AFS_SUPER_MAGIC): Define. * sysdeps/unix/sysv/linux/linux_fsinfo.h (AFS_SUPER_MAGIC): Define.

4
timezone/Makefile
View File

@ -44,10 +44,8 @@ include ../Makeconfig # Get objpfx defined so we can use it below.
CPPFLAGS-zic = -DNOT_IN_libc CPPFLAGS-zic = -DNOT_IN_libc
ifeq ($(have-ksh),yes)
install-bin-script = tzselect install-bin-script = tzselect
generated += tzselect generated += tzselect
endif
include ../Rules include ../Rules
@ -113,7 +111,7 @@ $(testdata)/Asia/Tokyo: asia $(zic-deps)
$(objpfx)tzselect: tzselect.ksh $(common-objpfx)config.make $(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 '/TZDIR=/s|\$$(pwd)|$(zonedir)|' \
-e '/TZVERSION=/s|see_Makefile|"$(version)"|' \ -e '/TZVERSION=/s|see_Makefile|"$(version)"|' \
-e '/PKGVERSION=/s|=.*|="$(PKGVERSION)"|' \ -e '/PKGVERSION=/s|=.*|="$(PKGVERSION)"|' \

0
timezone/tzselect.ksh Normal file → Executable file
View File