summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Olbrich <m.olbrich@pengutronix.de>2012-12-17 15:38:16 +0100
committerMichael Olbrich <m.olbrich@pengutronix.de>2012-12-17 15:38:16 +0100
commit094bac6ae68f7cbcd081373c92bb97ad6ae0ada2 (patch)
tree5d52860d0a8c8f2646076b16ec95ffd07faa2ea6
parent391daa2727f7b4c1631d1607bd66c39db47715a9 (diff)
downloadptxdist-094bac6ae68f7cbcd081373c92bb97ad6ae0ada2.tar.gz
ptxdist-094bac6ae68f7cbcd081373c92bb97ad6ae0ada2.tar.xz
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 <m.olbrich@pengutronix.de>
-rwxr-xr-xscripts/install_copy_toolchain.sh4
-rwxr-xr-xscripts/make_locale.sh1
-rwxr-xr-xscripts/make_zoneinfo.sh1
3 files changed, 1 insertions, 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