Improve INSTALL wizard: move all patch files to the separate directory

[tools/install.git] / config_files / omniORB-4.0.7.sh

diff --git a/config_files/omniORB-4.0.7.sh b/config_files/omniORB-4.0.7.sh
index a03f752b2e831caf827694503451e0a71144ad73..d0b3e88e4f5d0a0361113d7af4e8f97a464f83c7 100755 (executable)
--- a/config_files/omniORB-4.0.7.sh
+++ b/config_files/omniORB-4.0.7.sh
@@ -97,16 +97,20 @@ check_jb tar xfz ${SOURCE_DIR}/omniORB-4.0.7.tar.gz -C ${INSTALL_WORK}
 check_jb tar xfz ${SOURCE_DIR}/omniORBpy-2.7.tar.gz -C ${INSTALL_WORK}
 check_jb tar xfz ${SOURCE_DIR}/omniNotify-2.1.tar.gz -C ${INSTALL_WORK}
 
+# apply patches for 64-bit platforms
 if test `uname -m` = "x86_64" ; then
-cp omniORB-4.0.7.patch ${INSTALL_WORK}/omniORB-4.0.7
-cp omniORBpy-2.7.patch ${INSTALL_WORK}/omniORBpy-2.7
-cp omniNotify-2.1.patch ${INSTALL_WORK}/omniNotify
-cd ${INSTALL_WORK}/omniORB-4.0.7
-patch -p 1 -i omniORB-4.0.7.patch
-cd ${INSTALL_WORK}/omniORBpy-2.7
-patch -p 1 -i omniORBpy-2.7.patch
-cd ${INSTALL_WORK}/omniNotify
-patch -p 1 -i omniNotify-2.1.patch
+    if [ -f patches/omniORB-4.0.7-lib64.patch ] ; then
+       cp patches/omniORB-4.0.7-lib64.patch ${INSTALL_WORK}/omniORB-4.0.7
+       ( cd ${INSTALL_WORK}/omniORB-4.0.7 ; patch -p1 < omniORB-4.0.7-lib64.patch )
+    fi
+    if [ -f patches/omniORBpy-2.7-lib64.patch ] ; then
+       cp patches/omniORBpy-2.7-lib64.patch ${INSTALL_WORK}/omniORBpy-2.7
+       ( cd ${INSTALL_WORK}/omniORBpy-2.7 ; patch -p1 < omniORBpy-2.7-lib64.patch )
+    fi
+    if [ -f patches/omniNotify-2.1-lib64.patch ] ; then
+       cp patches/omniNotify-2.1-lib64.patch ${INSTALL_WORK}/omniNotify
+       ( cd ${INSTALL_WORK}/omniNotify ; patch -p1 < omniNotify-2.1-lib64.patch )
+    fi
 fi
 
 # install omniORB