[Ocfs2-test-devel] [PATCH 7/9] ocfs2-test: python_common - changed Config.make to set the correct directory

[Marcos Matsunaga]

Signed-off-by: Marcos Matsunaga <Marcos.Matsunaga at oracle.com>
---
 programs/python_common/Config.make       |    2 +-
 programs/python_common/config_py.skel    |   10 ----------
 programs/python_common/config_shell.skel |   10 ----------
 3 files changed, 1 insertions(+), 21 deletions(-)

diff --git a/programs/python_common/Config.make b/programs/python_common/Config.make
index 04384b3..92787b8 100644
--- a/programs/python_common/Config.make
+++ b/programs/python_common/Config.make
@@ -6,7 +6,7 @@ CONFIG_SCRIPT := setup.sh
 CURDIR = $(shell pwd)
 
 ifdef RPM_BUILD_ROOT
-INSTALLDIR = /usr/local
+INSTALLDIR = /usr/local/ocfs2-test
 endif
 
 config-script: $(CONFIG_SCRIPT) 
diff --git a/programs/python_common/config_py.skel b/programs/python_common/config_py.skel
index b7e4bcc..f27b2b8 100755
--- a/programs/python_common/config_py.skel
+++ b/programs/python_common/config_py.skel
@@ -31,22 +31,12 @@ LIBDIR = O2TDIR + '/lib'
 
 LOGFILE = O2TDIR + '/log/o2t.log'
 
-LAMBOOT = MPIDIR + '/lamboot'
-
-LAMHOSTS = WORKFILESDIR + '/lamhosts'
-
 MPIHOSTS = WORKFILESDIR + '/mpihosts'
 
-RECON = MPIDIR + '/recon'
-
-MPIRUNPARTS = BINDIR + '/mpi-run-parts'
-
 KERNELDIR = 'linux*'
 
 MPIRUN = MPIDIR + '/mpirun'
 
-LAMEXEC = MPIDIR + '/lamexec'
-
 NPROC = 1
 
 NOWAIT = '-nw'
diff --git a/programs/python_common/config_shell.skel b/programs/python_common/config_shell.skel
index 5310320..71680f1 100755
--- a/programs/python_common/config_shell.skel
+++ b/programs/python_common/config_shell.skel
@@ -30,21 +30,11 @@ LIBDIR=${O2TDIR}/lib
 export LIBDIR
 LOGFILE=${O2TDIR}/log/o2t.log
 export LOGFILE
-LAMBOOT=${MPIDIR}/lamboot
-export LAMBOOT
-LAMHOSTS=${WORKFILESDIR}/lamhosts
-export LAMHOSTS
 MPIHOSTS=${WORKFILESDIR}/mpihosts
 export MPIHOSTS
-RECON=${MPIDIR}/recon
-export RECON
-MPIRUNPARTS=${BINDIR}/mpi-run-parts
-export MPIRUNPARTS
 KERNELDIR=linux*
 export KERNELDIR
 MPIRUN=${MPIDIR}/mpirun
 export MPIRUN
-LAMEXEC=${MPIDIR}/lamexec
-export LAMEXEC
 NPROC=1
 export NPROC
-- 
1.5.6.5