From d3a1a7575c52dcd103bbc38b5ff7b034267d1459 Mon Sep 17 00:00:00 2001 From: akl Date: Wed, 15 Aug 2007 05:58:26 +0000 Subject: [PATCH] Fix problem with environment of sources. --- config_files/BOOST-1.31.0.sh | 4 +--- config_files/BOOST-1.32.0.sh | 4 +--- config_files/CALCULATOR.sh | 4 +--- config_files/CAS-6.2.sh | 4 +--- config_files/COMPONENT.sh | 4 +--- config_files/GEOM.sh | 4 +--- config_files/GHS3DPLUGIN.sh | 4 +--- config_files/GUI.sh | 4 +--- config_files/HELLO.sh | 4 +--- config_files/HXX2SALOME.sh | 4 +--- config_files/HXX2SALOMEDOC.sh | 4 +--- config_files/KERNEL.sh | 4 +--- config_files/LIGHT.sh | 4 +--- config_files/MED.sh | 4 +--- config_files/NETGENPLUGIN.sh | 4 +--- config_files/Numeric-22.0.sh | 4 +--- config_files/Numeric-23.7.sh | 4 +--- config_files/PYCALCULATOR.sh | 4 +--- config_files/PYHELLO.sh | 4 +--- config_files/PyQt-3.13.sh | 4 +--- config_files/PyQt-3.14.1.sh | 4 +--- config_files/Python-2.3.4.sh | 4 +--- config_files/Python-2.3.5.sh | 4 +--- config_files/Python-2.4.1.sh | 4 +--- config_files/SMESH.sh | 4 +--- config_files/SUPERV.sh | 4 +--- config_files/SWIG-1.3.24.sh | 4 +--- config_files/VISU.sh | 4 +--- config_files/VTK-4.2.2.sh | 4 +--- config_files/VTK-4.2.6.sh | 4 +--- config_files/docutils-0.3.7.sh | 4 +--- config_files/doxygen-1.4.6.sh | 4 +--- config_files/graphviz-1.9.sh | 4 +--- config_files/graphviz-2.2.1.sh | 4 +--- config_files/hdf5-1.6.3.sh | 4 +--- config_files/hdf5-1.6.4.sh | 4 +--- config_files/med-2.2.3.sh | 4 +--- config_files/msg2qm.sh | 4 +--- config_files/netgen-4.5.sh | 4 +--- config_files/omniORB-4.0.5.sh | 4 +--- config_files/omniORB-4.0.6.sh | 4 +--- config_files/omniORB-4.0.7.sh | 4 +--- config_files/qt-3.3.3.sh | 4 +--- config_files/qt-3.3.4.sh | 4 +--- config_files/qwt-0.4.1.sh | 4 +--- config_files/qwt-4.2.0.sh | 4 +--- config_files/sip-4.1.sh | 4 +--- config_files/sip-4.2.1.sh | 4 +--- config_files/tcltk-8.3.3.sh | 4 +--- config_files/tcltk-8.4.5.sh | 4 +--- config_files/tcltk-8.4.7.sh | 4 +--- 51 files changed, 51 insertions(+), 153 deletions(-) diff --git a/config_files/BOOST-1.31.0.sh b/config_files/BOOST-1.31.0.sh index 3c05694..174ac63 100755 --- a/config_files/BOOST-1.31.0.sh +++ b/config_files/BOOST-1.31.0.sh @@ -59,10 +59,8 @@ source ${INSTALL_WORK}/$SHRC # unpack check_jb tar xzf ${SOURCE_DIR}/${PRODUCT}.tar.gz -C ${INSTALL_ROOT} -if [ $PROCEDURE == "install_source" ]; then # to generate environment scripts - try_preinstalled -fi +try_preinstalled } install_source_and_build() diff --git a/config_files/BOOST-1.32.0.sh b/config_files/BOOST-1.32.0.sh index b658da9..880de12 100755 --- a/config_files/BOOST-1.32.0.sh +++ b/config_files/BOOST-1.32.0.sh @@ -59,10 +59,8 @@ source ${INSTALL_WORK}/$SHRC # unpack check_jb tar xzf ${SOURCE_DIR}/${PRODUCT}.tar.gz -C ${INSTALL_ROOT} -if [ $PROCEDURE == "install_source" ]; then # to generate environment scripts - try_preinstalled -fi +try_preinstalled } install_source_and_build() diff --git a/config_files/CALCULATOR.sh b/config_files/CALCULATOR.sh index 6c8ba17..02bcdb3 100755 --- a/config_files/CALCULATOR.sh +++ b/config_files/CALCULATOR.sh @@ -82,10 +82,8 @@ source ${INSTALL_WORK}/$SHRC check_jb tar xfz ${SOURCE_DIR}/CALCULATORsourcesV${VERSION}.tar.gz -C ${INSTALL_ROOT} -if [ $PROCEDURE == "install_source" ]; then # to generate environment scripts - try_preinstalled -fi +try_preinstalled } install_source_and_build() diff --git a/config_files/CAS-6.2.sh b/config_files/CAS-6.2.sh index 9108292..ecf6f35 100755 --- a/config_files/CAS-6.2.sh +++ b/config_files/CAS-6.2.sh @@ -81,10 +81,8 @@ source ${INSTALL_WORK}/$SHRC # unpack check_jb tar xfz ${SOURCE_DIR}/${PRODUCT}.tar.gz -C ${INSTALL_ROOT} -if [ $PROCEDURE == "install_source" ]; then # to generate environment scripts - try_preinstalled -fi +try_preinstalled } install_source_and_build() diff --git a/config_files/COMPONENT.sh b/config_files/COMPONENT.sh index c1751d4..a1d752a 100755 --- a/config_files/COMPONENT.sh +++ b/config_files/COMPONENT.sh @@ -82,10 +82,8 @@ source ${INSTALL_WORK}/$SHRC check_jb tar xfz ${SOURCE_DIR}/COMPONENTsourcesV${VERSION}.tar.gz -C ${INSTALL_ROOT} -if [ $PROCEDURE == "install_source" ]; then # to generate environment scripts - try_preinstalled -fi +try_preinstalled } install_source_and_build() diff --git a/config_files/GEOM.sh b/config_files/GEOM.sh index 68e0ed8..fba2b5a 100755 --- a/config_files/GEOM.sh +++ b/config_files/GEOM.sh @@ -80,10 +80,8 @@ source ${INSTALL_WORK}/$SHRC check_jb tar xfz ${SOURCE_DIR}/GEOMsourcesV${VERSION}.tar.gz -C ${INSTALL_ROOT} -if [ $PROCEDURE == "install_source" ]; then # to generate environment scripts - try_preinstalled -fi +try_preinstalled } install_source_and_build() diff --git a/config_files/GHS3DPLUGIN.sh b/config_files/GHS3DPLUGIN.sh index 35cd5bb..db15c66 100755 --- a/config_files/GHS3DPLUGIN.sh +++ b/config_files/GHS3DPLUGIN.sh @@ -82,10 +82,8 @@ source ${INSTALL_WORK}/$SHRC check_jb tar xfz ${SOURCE_DIR}/GHS3DPLUGINsourcesV${VERSION}.tar.gz -C ${INSTALL_ROOT} -if [ $PROCEDURE == "install_source" ]; then # to generate environment scripts - try_preinstalled -fi +try_preinstalled } install_source_and_build() diff --git a/config_files/GUI.sh b/config_files/GUI.sh index bd933f8..241f213 100755 --- a/config_files/GUI.sh +++ b/config_files/GUI.sh @@ -80,10 +80,8 @@ source ${INSTALL_WORK}/$SHRC check_jb tar xfz ${SOURCE_DIR}/GUIsourcesV${VERSION}.tar.gz -C ${INSTALL_ROOT} -if [ $PROCEDURE == "install_source" ]; then # to generate environment scripts - try_preinstalled -fi +try_preinstalled } install_source_and_build() diff --git a/config_files/HELLO.sh b/config_files/HELLO.sh index 8b3cc1f..703e42b 100755 --- a/config_files/HELLO.sh +++ b/config_files/HELLO.sh @@ -79,10 +79,8 @@ source ${INSTALL_WORK}/$SHRC check_jb tar xfz ${SOURCE_DIR}/HELLOsourcesV${VERSION}.tar.gz -C ${INSTALL_ROOT} -if [ $PROCEDURE == "install_source" ]; then # to generate environment scripts - try_preinstalled -fi +try_preinstalled } install_source_and_build() diff --git a/config_files/HXX2SALOME.sh b/config_files/HXX2SALOME.sh index e840cd3..56d85a9 100755 --- a/config_files/HXX2SALOME.sh +++ b/config_files/HXX2SALOME.sh @@ -54,10 +54,8 @@ source ${INSTALL_WORK}/$SHRC # unpack check_jb tar xfz ${SOURCE_DIR}/HXX2SALOMEsourcesV${VERSION}.tar.gz -C ${INSTALL_ROOT} -if [ $PROCEDURE == "install_source" ]; then # to generate environment scripts - try_preinstalled -fi +try_preinstalled } install_source_and_build() diff --git a/config_files/HXX2SALOMEDOC.sh b/config_files/HXX2SALOMEDOC.sh index 47ab052..7d232e7 100755 --- a/config_files/HXX2SALOMEDOC.sh +++ b/config_files/HXX2SALOMEDOC.sh @@ -52,10 +52,8 @@ source ${INSTALL_WORK}/$SHRC # unpack check_jb tar xfz ${SOURCE_DIR}/HXX2SALOMEDOCsourcesV${VERSION}.tar.gz -C ${INSTALL_ROOT} -if [ $PROCEDURE == "install_source" ]; then # to generate environment scripts - try_preinstalled -fi +try_preinstalled } install_source_and_build() diff --git a/config_files/KERNEL.sh b/config_files/KERNEL.sh index 8165429..c46af3f 100755 --- a/config_files/KERNEL.sh +++ b/config_files/KERNEL.sh @@ -80,10 +80,8 @@ source ${INSTALL_WORK}/$SHRC # unpack check_jb tar xfz ${SOURCE_DIR}/KERNELsourcesV${VERSION}.tar.gz -C ${INSTALL_ROOT} -if [ $PROCEDURE == "install_source" ]; then # to generate environment scripts - try_preinstalled -fi +try_preinstalled } install_source_and_build() diff --git a/config_files/LIGHT.sh b/config_files/LIGHT.sh index aaba12f..dc0b2f7 100755 --- a/config_files/LIGHT.sh +++ b/config_files/LIGHT.sh @@ -77,10 +77,8 @@ source ${INSTALL_WORK}/$SHRC check_jb tar xfz ${SOURCE_DIR}/LIGHTsourcesV${VERSION}.tar.gz -C ${INSTALL_ROOT} -if [ $PROCEDURE == "install_source" ]; then # to generate environment scripts - try_preinstalled -fi +try_preinstalled } install_source_and_build() diff --git a/config_files/MED.sh b/config_files/MED.sh index 90cec12..3ff3163 100755 --- a/config_files/MED.sh +++ b/config_files/MED.sh @@ -80,10 +80,8 @@ source ${INSTALL_WORK}/$SHRC check_jb tar xfz ${SOURCE_DIR}/MEDsourcesV${VERSION}.tar.gz -C ${INSTALL_ROOT} -if [ $PROCEDURE == "install_source" ]; then # to generate environment scripts - try_preinstalled -fi +try_preinstalled } install_source_and_build() diff --git a/config_files/NETGENPLUGIN.sh b/config_files/NETGENPLUGIN.sh index 151ae89..9b0bbf4 100755 --- a/config_files/NETGENPLUGIN.sh +++ b/config_files/NETGENPLUGIN.sh @@ -80,10 +80,8 @@ source ${INSTALL_WORK}/$SHRC check_jb tar xfz ${SOURCE_DIR}/NETGENPLUGINsourcesV${VERSION}.tar.gz -C ${INSTALL_ROOT} -if [ $PROCEDURE == "install_source" ]; then # to generate environment scripts - try_preinstalled -fi +try_preinstalled } install_source_and_build() diff --git a/config_files/Numeric-22.0.sh b/config_files/Numeric-22.0.sh index 23df1f3..64f1cec 100755 --- a/config_files/Numeric-22.0.sh +++ b/config_files/Numeric-22.0.sh @@ -54,10 +54,8 @@ source ${INSTALL_WORK}/$SHRC check_jb tar xfz ${SOURCE_DIR}/${PRODUCT}.tar.gz -C ${INSTALL_ROOT} -if [ $PROCEDURE == "install_source" ]; then # to generate environment scripts - try_preinstalled -fi +try_preinstalled } install_source_and_build() diff --git a/config_files/Numeric-23.7.sh b/config_files/Numeric-23.7.sh index 4435559..22b5cbe 100755 --- a/config_files/Numeric-23.7.sh +++ b/config_files/Numeric-23.7.sh @@ -57,10 +57,8 @@ source ${INSTALL_WORK}/$SHRC # unpack check_jb tar xfz ${SOURCE_DIR}/${PRODUCT}.tar.gz -C ${INSTALL_ROOT} -if [ $PROCEDURE == "install_source" ]; then # to generate environment scripts - try_preinstalled -fi +try_preinstalled } install_source_and_build() diff --git a/config_files/PYCALCULATOR.sh b/config_files/PYCALCULATOR.sh index 6bf40ff..2f2af86 100755 --- a/config_files/PYCALCULATOR.sh +++ b/config_files/PYCALCULATOR.sh @@ -79,10 +79,8 @@ source ${INSTALL_WORK}/$SHRC check_jb tar xfz ${SOURCE_DIR}/PYCALCULATORsourcesV${VERSION}.tar.gz -C ${INSTALL_ROOT} -if [ $PROCEDURE == "install_source" ]; then # to generate environment scripts - try_preinstalled -fi +try_preinstalled } install_source_and_build() diff --git a/config_files/PYHELLO.sh b/config_files/PYHELLO.sh index 53c5337..c604129 100755 --- a/config_files/PYHELLO.sh +++ b/config_files/PYHELLO.sh @@ -78,10 +78,8 @@ source ${INSTALL_WORK}/$SHRC check_jb tar xfz ${SOURCE_DIR}/PYHELLOsourcesV${VERSION}.tar.gz -C ${INSTALL_ROOT} -if [ $PROCEDURE == "install_source" ]; then # to generate environment scripts - try_preinstalled -fi +try_preinstalled } install_source_and_build() diff --git a/config_files/PyQt-3.13.sh b/config_files/PyQt-3.13.sh index 4d81ab6..b8bd987 100755 --- a/config_files/PyQt-3.13.sh +++ b/config_files/PyQt-3.13.sh @@ -68,10 +68,8 @@ source ${INSTALL_WORK}/$SHRC check_jb tar xfz ${SOURCE_DIR}/${PRODUCT}.tar.gz -C ${INSTALL_ROOT} -if [ $PROCEDURE == "install_source" ]; then # to generate environment scripts - try_preinstalled -fi +try_preinstalled } install_source_and_build() diff --git a/config_files/PyQt-3.14.1.sh b/config_files/PyQt-3.14.1.sh index fb6f2dd..8467878 100755 --- a/config_files/PyQt-3.14.1.sh +++ b/config_files/PyQt-3.14.1.sh @@ -68,10 +68,8 @@ source ${INSTALL_WORK}/$SHRC check_jb tar xfz ${SOURCE_DIR}/${PRODUCT}.tar.gz -C ${INSTALL_ROOT} -if [ $PROCEDURE == "install_source" ]; then # to generate environment scripts - try_preinstalled -fi +try_preinstalled } install_source_and_build() diff --git a/config_files/Python-2.3.4.sh b/config_files/Python-2.3.4.sh index ad5b11b..0b31afb 100755 --- a/config_files/Python-2.3.4.sh +++ b/config_files/Python-2.3.4.sh @@ -71,10 +71,8 @@ source ${INSTALL_WORK}/$SHRC # unpack check_jb tar xfz ${SOURCE_DIR}/${PRODUCT}.tar.gz -C ${INSTALL_ROOT} -if [ $PROCEDURE == "install_source" ]; then # to generate environment scripts - try_preinstalled -fi +try_preinstalled } install_source_and_build() diff --git a/config_files/Python-2.3.5.sh b/config_files/Python-2.3.5.sh index 6d37cad..50497ba 100755 --- a/config_files/Python-2.3.5.sh +++ b/config_files/Python-2.3.5.sh @@ -70,10 +70,8 @@ source ${INSTALL_WORK}/$SHRC check_jb tar xfz ${SOURCE_DIR}/${PRODUCT}.tar.gz -C ${INSTALL_ROOT} -if [ $PROCEDURE == "install_source" ]; then # to generate environment scripts - try_preinstalled -fi +try_preinstalled } install_source_and_build() diff --git a/config_files/Python-2.4.1.sh b/config_files/Python-2.4.1.sh index f4bbcdd..23a8d0e 100755 --- a/config_files/Python-2.4.1.sh +++ b/config_files/Python-2.4.1.sh @@ -95,10 +95,8 @@ if test `uname -m` = "x86_64" ; then fi fi -if [ $PROCEDURE == "install_source" ]; then # to generate environment scripts - try_preinstalled -fi +try_preinstalled } install_source_and_build() diff --git a/config_files/SMESH.sh b/config_files/SMESH.sh index 603e3d5..4bb21eb 100755 --- a/config_files/SMESH.sh +++ b/config_files/SMESH.sh @@ -80,10 +80,8 @@ source ${INSTALL_WORK}/$SHRC check_jb tar xfz ${SOURCE_DIR}/SMESHsourcesV${VERSION}.tar.gz -C ${INSTALL_ROOT} -if [ $PROCEDURE == "install_source" ]; then # to generate environment scripts - try_preinstalled -fi +try_preinstalled } install_source_and_build() diff --git a/config_files/SUPERV.sh b/config_files/SUPERV.sh index 29d2a8c..b265abd 100755 --- a/config_files/SUPERV.sh +++ b/config_files/SUPERV.sh @@ -80,10 +80,8 @@ source ${INSTALL_WORK}/$SHRC check_jb tar xfz ${SOURCE_DIR}/SUPERVsourcesV${VERSION}.tar.gz -C ${INSTALL_ROOT} -if [ $PROCEDURE == "install_source" ]; then # to generate environment scripts - try_preinstalled -fi +try_preinstalled } install_source_and_build() diff --git a/config_files/SWIG-1.3.24.sh b/config_files/SWIG-1.3.24.sh index ddad1a3..56e7139 100755 --- a/config_files/SWIG-1.3.24.sh +++ b/config_files/SWIG-1.3.24.sh @@ -58,10 +58,8 @@ source ${INSTALL_WORK}/$SHRC check_jb tar xfz ${SRC_DIR}/${PRODUCT}.tar.gz -C ${INSTALL_ROOT} -if [ $PROCEDURE == "install_source" ]; then # to generate environment scripts - try_preinstalled -fi +try_preinstalled } install_source_and_build() diff --git a/config_files/VISU.sh b/config_files/VISU.sh index c975df9..7cbd248 100755 --- a/config_files/VISU.sh +++ b/config_files/VISU.sh @@ -80,10 +80,8 @@ source ${INSTALL_WORK}/$SHRC check_jb tar xfz ${SOURCE_DIR}/VISUsourcesV${VERSION}.tar.gz -C ${INSTALL_ROOT} -if [ $PROCEDURE == "install_source" ]; then # to generate environment scripts - try_preinstalled -fi +try_preinstalled } install_source_and_build() diff --git a/config_files/VTK-4.2.2.sh b/config_files/VTK-4.2.2.sh index b8399af..a84a606 100755 --- a/config_files/VTK-4.2.2.sh +++ b/config_files/VTK-4.2.2.sh @@ -66,10 +66,8 @@ makedir ${PRODUCT_DIR}_SRC check_jb tar xfz ${SOURCE_DIR}/cmake-1.6.6.tar.gz -C ${PRODUCT_DIR}_SRC check_jb tar xfz ${SOURCE_DIR}/${PRODUCT}.tar.gz -C ${PRODUCT_DIR}_SRC -if [ $PROCEDURE == "install_source" ]; then # to generate environment scripts - try_preinstalled -fi +try_preinstalled } install_source_and_build() diff --git a/config_files/VTK-4.2.6.sh b/config_files/VTK-4.2.6.sh index f3cd246..e4e1068 100755 --- a/config_files/VTK-4.2.6.sh +++ b/config_files/VTK-4.2.6.sh @@ -83,10 +83,8 @@ if [ -f patches/vtk-4.2.6-patented.patch ] ; then ( cd ${PRODUCT_DIR}_SRC/${PRODUCT}_SRC ; patch -p1 < vtk-4.2.6-patented.patch ) fi -if [ $PROCEDURE == "install_source" ]; then # to generate environment scripts - try_preinstalled -fi +try_preinstalled } install_source_and_build() diff --git a/config_files/docutils-0.3.7.sh b/config_files/docutils-0.3.7.sh index b994dd1..90180d3 100755 --- a/config_files/docutils-0.3.7.sh +++ b/config_files/docutils-0.3.7.sh @@ -53,10 +53,8 @@ source ${INSTALL_WORK}/$SHRC # unpack check_jb tar xfz ${SOURCE_DIR}/${PRODUCT}.tar.gz -C ${INSTALL_ROOT} -if [ $PROCEDURE == "install_source" ]; then # to generate environment scripts - try_preinstalled -fi +try_preinstalled } install_source_and_build() diff --git a/config_files/doxygen-1.4.6.sh b/config_files/doxygen-1.4.6.sh index f9e58af..7a8d5a5 100755 --- a/config_files/doxygen-1.4.6.sh +++ b/config_files/doxygen-1.4.6.sh @@ -65,10 +65,8 @@ source ${INSTALL_WORK}/$SHRC # unpack check_jb tar xfz ${SOURCE_DIR}/${PRODUCT}.tar.gz -C ${INSTALL_ROOT} -if [ $PROCEDURE == "install_source" ]; then # to generate environment scripts - try_preinstalled -fi +try_preinstalled } install_source_and_build() diff --git a/config_files/graphviz-1.9.sh b/config_files/graphviz-1.9.sh index d5737d9..a3749a8 100755 --- a/config_files/graphviz-1.9.sh +++ b/config_files/graphviz-1.9.sh @@ -60,10 +60,8 @@ source ${INSTALL_WORK}/$SHRC check_jb tar xfz ${SOURCE_DIR}/${PRODUCT}.tar.gz -C ${INSTALL_ROOT} -if [ $PROCEDURE == "install_source" ]; then # to generate environment scripts - try_preinstalled -fi +try_preinstalled } install_source_and_build() diff --git a/config_files/graphviz-2.2.1.sh b/config_files/graphviz-2.2.1.sh index 5c66a10..b6c4f99 100755 --- a/config_files/graphviz-2.2.1.sh +++ b/config_files/graphviz-2.2.1.sh @@ -65,10 +65,8 @@ source ${INSTALL_WORK}/$SHRC # unpack check_jb tar xfz ${SOURCE_DIR}/${PRODUCT}.tar.gz -C ${INSTALL_ROOT} -if [ $PROCEDURE == "install_source" ]; then # to generate environment scripts - try_preinstalled -fi +try_preinstalled } install_source_and_build() diff --git a/config_files/hdf5-1.6.3.sh b/config_files/hdf5-1.6.3.sh index efb89a9..d09b4c6 100755 --- a/config_files/hdf5-1.6.3.sh +++ b/config_files/hdf5-1.6.3.sh @@ -68,10 +68,8 @@ source ${INSTALL_WORK}/$SHRC check_jb tar xfz ${SOURCE_DIR}/${PRODUCT}.tar.gz -C ${INSTALL_ROOT} -if [ $PROCEDURE == "install_source" ]; then # to generate environment scripts - try_preinstalled -fi +try_preinstalled } install_source_and_build() diff --git a/config_files/hdf5-1.6.4.sh b/config_files/hdf5-1.6.4.sh index 939e031..51cb57a 100755 --- a/config_files/hdf5-1.6.4.sh +++ b/config_files/hdf5-1.6.4.sh @@ -69,10 +69,8 @@ source ${INSTALL_WORK}/$SHRC # unpack check_jb tar xfz ${SOURCE_DIR}/${PRODUCT}.tar.gz -C ${INSTALL_ROOT} -if [ $PROCEDURE == "install_source" ]; then # to generate environment scripts - try_preinstalled -fi +try_preinstalled } install_source_and_build() diff --git a/config_files/med-2.2.3.sh b/config_files/med-2.2.3.sh index 82ba28a..38d8d82 100755 --- a/config_files/med-2.2.3.sh +++ b/config_files/med-2.2.3.sh @@ -64,10 +64,8 @@ source ${INSTALL_WORK}/$SHRC # unpack check_jb tar xfz ${SOURCE_DIR}/${PRODUCT}.tar.gz -C ${INSTALL_ROOT} -if [ $PROCEDURE == "install_source" ]; then # to generate environment scripts - try_preinstalled -fi +try_preinstalled } install_source_and_build() diff --git a/config_files/msg2qm.sh b/config_files/msg2qm.sh index bf06151..f318bc3 100755 --- a/config_files/msg2qm.sh +++ b/config_files/msg2qm.sh @@ -59,10 +59,8 @@ source ${INSTALL_WORK}/$SHRC # unpack check_jb tar xfz ${SOURCE_DIR}/${PRODUCT}.tar.gz -C ${INSTALL_ROOT} -if [ $PROCEDURE == "install_source" ]; then # to generate environment scripts - try_preinstalled -fi +try_preinstalled } install_source_and_build() diff --git a/config_files/netgen-4.5.sh b/config_files/netgen-4.5.sh index 9c7a416..c524d68 100755 --- a/config_files/netgen-4.5.sh +++ b/config_files/netgen-4.5.sh @@ -80,10 +80,8 @@ fi # apply patch: to make compilable with CASCADE-6.1.1 (cd ${PRODUCT_DIR}_SRC/libsrc; sed -e "s%\(.*\)-DHAVE_LIMITS\'%\1-DHAVE_LIMITS_H%g" makefile.inc > makefile.inc.new; mv makefile.inc.new makefile.inc) -if [ $PROCEDURE == "install_source" ]; then # to generate environment scripts - try_preinstalled -fi +try_preinstalled } install_source_and_build() diff --git a/config_files/omniORB-4.0.5.sh b/config_files/omniORB-4.0.5.sh index 0d0b8ee..82a98a1 100755 --- a/config_files/omniORB-4.0.5.sh +++ b/config_files/omniORB-4.0.5.sh @@ -86,10 +86,8 @@ check_jb tar xfz ${SOURCE_DIR}/${PRODUCT}.tar.gz -C ${PRODUCT_DIR}_SRC check_jb tar xfz ${SOURCE_DIR}/omniORBpy-2.5.tar.gz -C ${PRODUCT_DIR}_SRC check_jb tar xfz ${SOURCE_DIR}/omniNotify-2.1.tar.gz -C ${PRODUCT_DIR}_SRC -if [ $PROCEDURE == "install_source" ]; then # to generate environment scripts - try_preinstalled -fi +try_preinstalled } install_source_and_build() diff --git a/config_files/omniORB-4.0.6.sh b/config_files/omniORB-4.0.6.sh index e679708..d3a6fd7 100755 --- a/config_files/omniORB-4.0.6.sh +++ b/config_files/omniORB-4.0.6.sh @@ -85,10 +85,8 @@ check_jb tar xfz ${SOURCE_DIR}/${PRODUCT}.tar.gz -C ${PRODUCT_DIR}_SRC check_jb tar xfz ${SOURCE_DIR}/omniORBpy-2.6.tar.gz -C ${PRODUCT_DIR}_SRC check_jb tar xfz ${SOURCE_DIR}/omniNotify-2.1.tar.gz -C ${PRODUCT_DIR}_SRC -if [ $PROCEDURE == "install_source" ]; then # to generate environment scripts - try_preinstalled -fi +try_preinstalled } install_source_and_build() diff --git a/config_files/omniORB-4.0.7.sh b/config_files/omniORB-4.0.7.sh index e2492b6..d9edd27 100755 --- a/config_files/omniORB-4.0.7.sh +++ b/config_files/omniORB-4.0.7.sh @@ -105,10 +105,8 @@ if test `uname -m` = "x86_64" ; then fi fi -if [ $PROCEDURE == "install_source" ]; then # to generate environment scripts - try_preinstalled -fi +try_preinstalled } install_source_and_build() diff --git a/config_files/qt-3.3.3.sh b/config_files/qt-3.3.3.sh index 2e2299c..9cd044a 100755 --- a/config_files/qt-3.3.3.sh +++ b/config_files/qt-3.3.3.sh @@ -61,10 +61,8 @@ source ${INSTALL_WORK}/$SHRC check_jb tar xfz ${SOURCE_DIR}/${PRODUCT}.tar.gz -C ${INSTALL_ROOT} -if [ $PROCEDURE == "install_source" ]; then # to generate environment scripts - try_preinstalled -fi +try_preinstalled } install_source_and_build() diff --git a/config_files/qt-3.3.4.sh b/config_files/qt-3.3.4.sh index 5195d0d..3c2f015 100755 --- a/config_files/qt-3.3.4.sh +++ b/config_files/qt-3.3.4.sh @@ -60,10 +60,8 @@ source ${INSTALL_WORK}/$SHRC check_jb tar xfz ${SOURCE_DIR}/${PRODUCT}.tar.gz -C ${INSTALL_ROOT} -if [ $PROCEDURE == "install_source" ]; then # to generate environment scripts - try_preinstalled -fi +try_preinstalled } install_source_and_build() diff --git a/config_files/qwt-0.4.1.sh b/config_files/qwt-0.4.1.sh index ed8e8b4..e1c24a9 100755 --- a/config_files/qwt-0.4.1.sh +++ b/config_files/qwt-0.4.1.sh @@ -59,10 +59,8 @@ source ${INSTALL_WORK}/$SHRC check_jb tar xfz ${SOURCE_DIR}/${PRODUCT}.tar.gz -C ${INSTALL_ROOT} -if [ $PROCEDURE == "install_source" ]; then # to generate environment scripts - try_preinstalled -fi +try_preinstalled } install_source_and_build() diff --git a/config_files/qwt-4.2.0.sh b/config_files/qwt-4.2.0.sh index 0bbe5c8..c615eba 100755 --- a/config_files/qwt-4.2.0.sh +++ b/config_files/qwt-4.2.0.sh @@ -65,10 +65,8 @@ source ${INSTALL_WORK}/$SHRC check_jb tar xfz ${SOURCE_DIR}/${PRODUCT}.tar.gz -C ${INSTALL_ROOT} -if [ $PROCEDURE == "install_source" ]; then # to generate environment scripts - try_preinstalled -fi +try_preinstalled } install_source_and_build() diff --git a/config_files/sip-4.1.sh b/config_files/sip-4.1.sh index 6f43df1..4187208 100755 --- a/config_files/sip-4.1.sh +++ b/config_files/sip-4.1.sh @@ -65,10 +65,8 @@ source ${INSTALL_WORK}/$SHRC check_jb tar xfz ${SOURCE_DIR}/${PRODUCT}.tar.gz -C ${INSTALL_ROOT} -if [ $PROCEDURE == "install_source" ]; then # to generate environment scripts - try_preinstalled -fi +try_preinstalled } install_source_and_build() diff --git a/config_files/sip-4.2.1.sh b/config_files/sip-4.2.1.sh index 8b6be70..7afe6a9 100755 --- a/config_files/sip-4.2.1.sh +++ b/config_files/sip-4.2.1.sh @@ -73,10 +73,8 @@ if test `uname -m` = "x86_64" ; then fi fi -if [ $PROCEDURE == "install_source" ]; then # to generate environment scripts - try_preinstalled -fi +try_preinstalled } install_source_and_build() diff --git a/config_files/tcltk-8.3.3.sh b/config_files/tcltk-8.3.3.sh index 9e7ff1c..f337700 100755 --- a/config_files/tcltk-8.3.3.sh +++ b/config_files/tcltk-8.3.3.sh @@ -94,10 +94,8 @@ check_jb tar xfz ${SOURCE_DIR}/tcl8.3.3.tar.gz -C ${PRODUCT_DIR}_SRC check_jb tar xfz ${SOURCE_DIR}/tk8.3.3.tar.gz -C ${PRODUCT_DIR}_SRC check_jb tar xfz ${SOURCE_DIR}/tclx8.3.tar.gz -C ${PRODUCT_DIR}_SRC -if [ $PROCEDURE == "install_source" ]; then # to generate environment scripts - try_preinstalled -fi +try_preinstalled } install_source_and_build() diff --git a/config_files/tcltk-8.4.5.sh b/config_files/tcltk-8.4.5.sh index 2f7ee9a..596b857 100755 --- a/config_files/tcltk-8.4.5.sh +++ b/config_files/tcltk-8.4.5.sh @@ -95,10 +95,8 @@ check_jb tar xfz ${SOURCE_DIR}/tcl-8.4.5.tar.gz -C ${PRODUCT_DIR}_SRC check_jb tar xfz ${SOURCE_DIR}/tk-8.4.5.tar.gz -C ${PRODUCT_DIR}_SRC check_jb tar xfz ${SOURCE_DIR}/tclx-8.3.5.tar.gz -C ${PRODUCT_DIR}_SRC -if [ $PROCEDURE == "install_source" ]; then # to generate environment scripts - try_preinstalled -fi +try_preinstalled } install_source_and_build() diff --git a/config_files/tcltk-8.4.7.sh b/config_files/tcltk-8.4.7.sh index 40f042e..20082d8 100755 --- a/config_files/tcltk-8.4.7.sh +++ b/config_files/tcltk-8.4.7.sh @@ -94,10 +94,8 @@ check_jb tar xfz ${SOURCE_DIR}/tcl-8.4.7.tar.gz -C ${PRODUCT_DIR}_SRC check_jb tar xfz ${SOURCE_DIR}/tk-8.4.7.tar.gz -C ${PRODUCT_DIR}_SRC check_jb tar xfz ${SOURCE_DIR}/tclx-8.3.5.tar.gz -C ${PRODUCT_DIR}_SRC -if [ $PROCEDURE == "install_source" ]; then # to generate environment scripts - try_preinstalled -fi +try_preinstalled } install_source_and_build() -- 2.39.2