Minor fixes

diff --git a/config_files/hdf5-1.6.9.sh b/config_files/hdf5-1.6.9.sh
index 1ed18904d3b365914df3997b210b383f7f72e59d..8ba4ce9d9039e1c07d19cf1f9c66c23501bf3ec6 100755 (executable)
--- a/config_files/hdf5-1.6.9.sh
+++ b/config_files/hdf5-1.6.9.sh
@@ -84,7 +84,7 @@ install_source_and_build()
 install_source
 
 # build sources
-HDF_CONFIGURE_OPTIONS="--disable-debug --enable-production --enable-threadsafe --enable-hdf5v1_2 --enable-stream-vfd --disable-hsizet --with-pthread=/usr/include,/usr/lib"
+HDF_CONFIGURE_OPTIONS="--disable-debug --enable-production --enable-threadsafe --enable-hdf5v1_4 --enable-stream-vfd --disable-hsizet --with-pthread=/usr/include,/usr/lib"
 if test `uname -m` == "x86_64" ; then
     HDF_CONFIGURE_OPTIONS="${HDF_CONFIGURE_OPTIONS} CFLAGS=-m64 CXXFLAGS=-m64"
 fi

diff --git a/config_files/qwt-5.2.0.sh b/config_files/qwt-5.2.0.sh
index 13c07abacf6e74dae3a75cd877e7836fb502cd76..c07c6b5f07997c327816a3193c095d6e9f7d9eec 100755 (executable)
--- a/config_files/qwt-5.2.0.sh
+++ b/config_files/qwt-5.2.0.sh
@@ -12,6 +12,11 @@
 #
 ####################################################################################
 
+#
+# QWT version
+#
+QWT_VERSION=5.2.0
+
 check_version()
 {
 if [ -n "${QWTHOME}" ] ; then 
@@ -21,7 +26,7 @@ if [ -n "${QWTHOME}" ] ; then
     fi
     if [ -f $qwtinc ] ; then
        ver=`grep -e "^#define[[:space:]]\+QWT_VERSION_STR" $qwtinc | sed -e 's/^#define[[:space:]]\+QWT_VERSION_STR[[:space:]]*"\(.*\)"/\1/'`
-       if [ "$ver" == "5.2.0" ]; then
+       if [ "$ver" == "${QWT_VERSION}" ]; then
            return 0
        fi
     fi
@@ -80,11 +85,11 @@ test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR}
 
 sed -e "s%\(INSTALLBASE[[:space:]]*\)=\([[:space:]]*\).*%\1=\2${PRODUCT_DIR}%g" \
     -e "s%#\(CONFIG[[:space:]]*+=[[:space:]]*QwtSVGItem\)%\1%g" qwtconfig.pri > qwtconfig.pri.new
-mv qwtconfig.pri.new qwtconfig.pri
+mv -f qwtconfig.pri.new qwtconfig.pri
 
 sed -e "s%\(target\.path[[:space:]]*\)=\([[:space:]]*\).*%\1=\2\$\$INSTALLBASE/plugins/designer%g" \
     designer/designer.pro > designer/designer.pro.new
-mv designer/designer.pro.new designer/designer.pro
+mv -f designer/designer.pro.new designer/designer.pro
 
 INSTALL_ROOT_PREV=$INSTALL_ROOT
 unset INSTALL_ROOT
@@ -139,7 +144,7 @@ export INSTALL_PRODUCTS=$7;
 shift
 REMOVE_SRC_TMP=$8;
 test $# == 10 && shift && SINGLE_DIR=$9
-export PRODUCT="qwt-5.2.0"
+export PRODUCT="qwt-${QWT_VERSION}"
 export PRODUCT_DIR=${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
 export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT}
 export PRODUCT_SRC_DIR=${INST_ROOT}/${PRODUCT}_SRC