fix a bug with 'test -n' option

[tools/install.git] / config_files / doxygen-1.3-rc2.sh

diff --git a/config_files/doxygen-1.3-rc2.sh b/config_files/doxygen-1.3-rc2.sh
index 6cf6fcf1b7d1a7eac1802d7ca98e54292ea65c30..2aaf2f329cedaf5e04577cd029b2b48cfc85ab4f 100755 (executable)
--- a/config_files/doxygen-1.3-rc2.sh
+++ b/config_files/doxygen-1.3-rc2.sh
@@ -15,9 +15,12 @@ if [ "$?" -ne "0" ]; then
    return 1
 fi
 check_lib_version doxywizard $PATH
-if [ "$?" -eq "0" ]; then
-   #echo "The product ${PRODUCT} has been already installed on yours system"
-   return 0
+if [ "$?" -ne "0" ]; then
+   return 1
+fi
+ver=`doxygen --version`
+if [ "$ver" == "1.3-rc2" ]; then
+    return 0
 fi
 return 1
 }
@@ -65,7 +68,10 @@ check_jb tar xfz ${SOURCE_DIR}/doxygen-1.3-rc2.tar.gz -C ${INSTALL_WORK}
 
 cd ${PRODUCT_WORK}
 makedir ${PRODUCT_DIR}
-check_job ${PRODUCT_DIR}/CONFIGURE.LOG configure --with-doxywizard --prefix ${PRODUCT_DIR}
+# vsr: fix bug - configure fails on Red Hat 9 because of incorrect autodetect check for install tool
+# so it is necessary to put it directly
+f_install="--install "`which install`
+check_job ${PRODUCT_DIR}/CONFIGURE.LOG configure --with-doxywizard --prefix ${PRODUCT_DIR} $f_install
 GCC=`which gcc`
 cat >> ${PRODUCT_DIR}/MAKE.LOG <<EOF
 used gcc=$GCC