Improve qwt installation procedure

diff --git a/config.xml b/config.xml
index 6a085c5dee4cdbe9befadfcab608217308441d1e..d69fc440f38a564820842b4706801c1c326d1d05 100644 (file)
--- a/config.xml
+++ b/config.xml
@@ -113,8 +113,8 @@
           supported="install sources,install binaries"
           disable="false"
           dependancies="gcc,Qt"
-          installdiskspace="3045"
-          temporarydiskspace="3528"
+          installdiskspace="483"
+          temporarydiskspace="3579"
           script="qwt-0.4.1.sh"/>
   <product name="Hdf" 
            version="5-1.4.4" 

diff --git a/config_RedHat8_0.xml b/config_RedHat8_0.xml
index 6a085c5dee4cdbe9befadfcab608217308441d1e..d69fc440f38a564820842b4706801c1c326d1d05 100644 (file)
--- a/config_RedHat8_0.xml
+++ b/config_RedHat8_0.xml
@@ -113,8 +113,8 @@
           supported="install sources,install binaries"
           disable="false"
           dependancies="gcc,Qt"
-          installdiskspace="3045"
-          temporarydiskspace="3528"
+          installdiskspace="483"
+          temporarydiskspace="3579"
           script="qwt-0.4.1.sh"/>
   <product name="Hdf" 
            version="5-1.4.4" 

diff --git a/config_RedHat8_0_with_Mesa.xml b/config_RedHat8_0_with_Mesa.xml
index b0519515ebf7104e255f72040ad11f4d6b1b8bab..3202c038a9b0df64de2c3156092e38cb099e6379 100644 (file)
--- a/config_RedHat8_0_with_Mesa.xml
+++ b/config_RedHat8_0_with_Mesa.xml
@@ -113,8 +113,8 @@
           supported="install sources,install binaries"
           disable="false"
           dependancies="gcc,Qt,Mesa"
-          installdiskspace="3045"
-          temporarydiskspace="3528"
+          installdiskspace="459"
+          temporarydiskspace="3524"
           script="qwt-0.4.1.sh"/>
   <product name="Hdf" 
            version="5-1.4.4" 

diff --git a/config_files/qwt-0.4.1.sh b/config_files/qwt-0.4.1.sh
index c40926064b4415a9a08ed1a307037d2a19ccae48..7f6db0df63d91546912bf58fa45c35dc8b6d165d 100755 (executable)
--- a/config_files/qwt-0.4.1.sh
+++ b/config_files/qwt-0.4.1.sh
@@ -55,8 +55,9 @@ install_source()
 make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE}
 source ${INSTALL_WORK}/$SHRC
 
-check_jb tar xfz ${SOURCE_DIR}/qwt-0.4.1.tar.gz -C ${INSTALL_ROOT}
-cd ${PRODUCT_DIR}
+check_jb tar xfz ${SOURCE_DIR}/qwt-0.4.1.tar.gz -C ${INSTALL_WORK}
+cd ${PRODUCT_WORK}
+makedir ${PRODUCT_DIR}
 
 qmake qwt.pro -o Makefile
 
@@ -64,9 +65,11 @@ GCC=`which gcc`
 cat >> ${PRODUCT_DIR}/MAKE.LOG <<EOF
 used gcc=$GCC
 EOF
+
 check_job ${PRODUCT_DIR}/MAKE.LOG make 
+cp -rf include lib ${PRODUCT_DIR}
 
-rm -rf src/moc src/obj
+rm -rf ${PRODUCT_WORK}
 
 print_env
 }