From 58e1bf3c3dca620c598e2d6ca26eae0ec69674df Mon Sep 17 00:00:00 2001
From: vsr <vsr@opencascade.com>
Date: Thu, 25 Mar 2004 08:31:11 +0000
Subject: [PATCH] Improve qwt installation procedure

---
 config.xml                     | 4 ++--
 config_RedHat8_0.xml           | 4 ++--
 config_RedHat8_0_with_Mesa.xml | 4 ++--
 config_files/qwt-0.4.1.sh      | 9 ++++++---
 4 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/config.xml b/config.xml
index 6a085c5..d69fc44 100644
--- 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 6a085c5..d69fc44 100644
--- 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 b051951..3202c03 100644
--- 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 c409260..7f6db0d 100755
--- 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
 }
-- 
2.39.2