From 094bac6ae68f7cbcd081373c92bb97ad6ae0ada2 Mon Sep 17 00:00:00 2001 From: Michael Olbrich Date: Mon, 17 Dec 2012 15:38:16 +0100 Subject: install_copy_toolchain: remove hack make_locale.sh and make_zoneinfo.sh don't need to source install_copy_toolchain.sh any more. Signed-off-by: Michael Olbrich --- scripts/install_copy_toolchain.sh | 4 +--- scripts/make_locale.sh | 1 - scripts/make_zoneinfo.sh | 1 - 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/scripts/install_copy_toolchain.sh b/scripts/install_copy_toolchain.sh index 93606e869..0cf4d3124 100755 --- a/scripts/install_copy_toolchain.sh +++ b/scripts/install_copy_toolchain.sh @@ -257,6 +257,4 @@ ptxd_install_copy_toolchain() { # # main() # -# FIXME: ugly hack to use this script as library as well -# -[ $(basename $0) != "make_locale.sh" ] && [ $(basename $0) != "make_zoneinfo.sh" ] && ptxd_install_copy_toolchain "${@}" +ptxd_install_copy_toolchain "${@}" diff --git a/scripts/make_locale.sh b/scripts/make_locale.sh index 9f741df52..6bcca593a 100755 --- a/scripts/make_locale.sh +++ b/scripts/make_locale.sh @@ -7,7 +7,6 @@ fi . ${PTXDIST_TOPDIR}/scripts/ptxdist_vars.sh . ${SCRIPTSDIR}/libptxdist.sh -. ${SCRIPTSDIR}/install_copy_toolchain.sh usage() { echo diff --git a/scripts/make_zoneinfo.sh b/scripts/make_zoneinfo.sh index 6b77d60c6..9d351067d 100755 --- a/scripts/make_zoneinfo.sh +++ b/scripts/make_zoneinfo.sh @@ -7,7 +7,6 @@ fi . ${PTXDIST_TOPDIR}/scripts/ptxdist_vars.sh . ${SCRIPTSDIR}/libptxdist.sh -. ${SCRIPTSDIR}/install_copy_toolchain.sh usage() { echo -- cgit v1.2.3