--- trunk/include/multilib.sminc 2014/02/19 12:23:44 20980 +++ trunk/include/multilib.sminc 2014/03/03 09:56:03 20987 @@ -261,7 +261,7 @@ # rename the old one old_mconfigure=old$(typeset -f mconfigure) eval "${old_mconfigure}" -fi + mconfigure() { local abi @@ -276,13 +276,14 @@ abi-${abi} oldmconfigure $@ || die done } +fi if [[ ! -z $(typeset -f cmake_configure) ]] then # rename the old one old_cmake_configure=old$(typeset -f cmake_configure) eval "${old_cmake_configure}" -fi + cmake_configure() { local abi @@ -301,13 +302,14 @@ # restore SRCDIR SRCDIR="${saved_SRCDIR}" } +fi if [[ ! -z $(typeset -f cmake_src_compile) ]] then # rename the old one old_cmake_src_compile=old$(typeset -f cmake_src_compile) eval "${old_cmake_src_compile}" -fi + cmake_src_compile() { local abi @@ -334,13 +336,14 @@ abi-${abi} oldmmake $@ || die done } +fi if [[ ! -z $(typeset -f cmake_src_check) ]] then # rename the old one old_cmake_src_check=old$(typeset -f cmake_src_check) eval "${old_cmake_check}" -fi + cmake_src_check() { local abi @@ -355,13 +358,14 @@ mmake -j1 -k check || die done } +fi if [[ ! -z $(typeset -f cmake_src_install) ]] then # rename the old one old_cmake_src_install=old$(typeset -f cmake_src_install) eval "${old_cmake_install}" -fi + cmake_src_install() { local abi @@ -377,13 +381,14 @@ abi-${abi} oldmmake DESTDIR=${BINDIR} $@ install || die done } +fi if [[ ! -z $(typeset -f munpack) ]] then # rename the old one old_munpack=old$(typeset -f munpack) eval "${old_munpack}" -fi + munpack() { local abi @@ -399,13 +404,14 @@ mv ${SRCDIR} ${SRCDIR}-${abi} || die done } +fi if [[ ! -z $(typeset -f mmake) ]] then # rename the old one old_mmake=old$(typeset -f mmake) eval "${old_mmake}" -fi + mmake() { local abi @@ -421,13 +427,14 @@ abi-${abi} oldmmake $@ || die done } +fi if [[ ! -z $(typeset -f minstall) ]] then # rename the old one old_minstall=old$(typeset -f minstall) eval "${old_minstall}" -fi + minstall() { local abi @@ -443,6 +450,7 @@ abi-${abi} oldminstall $@ || die done } +fi minstall_destdir() { @@ -465,7 +473,7 @@ # rename the old one old_mpatch=old$(typeset -f mpatch) eval "${old_mpatch}" -fi + mpatch() { local abi @@ -481,13 +489,14 @@ oldmpatch $@ || die done } +fi if [[ ! -z $(typeset -f mlibtoolize) ]] then # rename the old one old_mlibtoolize=old$(typeset -f mlibtoolize) eval "${old_mlibtoolize}" -fi + mlibtoolize() { local abi @@ -503,13 +512,14 @@ oldmlibtoolize $@ || die done } +fi if [[ ! -z $(typeset -f mautoreconf) ]] then # rename the old one old_mautoreconf=old$(typeset -f mautoreconf) eval "${old_mautoreconf}" -fi + mautoreconf() { local abi @@ -525,13 +535,14 @@ oldmautoreconf $@ || die done } +fi if [[ ! -z $(typeset -f minstalldocs) ]] then # rename the old one old_minstalldocs=old$(typeset -f minstalldocs) eval "${old_minstalldocs}" -fi + minstalldocs() { local abi @@ -548,6 +559,7 @@ oldminstalldocs $@ || die done } +fi ## # multilib mbuild wrappers