[Ocfs2-test-devel] [PATCH 1/2] Ocfs2-test: Fix a bug which caused default 'make install' failed.

[Tristan Ye]

Current ocfs2-test.git will definitely fail at setup.sh when default
installing(make install <without DESTDIR specified>) or specify prefix
nothing when configuring. That's due to a wrong parameter passed to
setup.sh in programs/python_common/Config.make:

$(SHELL) $(CURDIR)/$(CONFIG_SCRIPT) $(DESTDIR) $(INSTALLDIR)

Cause setup.sh was expecting a right location where ocfs2-test installation
resides, $(DESTDIR) sometimes was not an appropriate one to exactly describe
the location other than the case when DESTDIR was specified and prefix is
specified as '/' during 'configure' and 'make install DESTDIR=/path/to/install',
we therefore use ${DESTDIR}${exec_prefix} instead to comfort setup.sh!

The following patch isn't going to affect rpm building and installation however.

Signed-off-by: Tristan Ye <tristan.ye at oracle.com>
---
 programs/python_common/Config.make |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/programs/python_common/Config.make b/programs/python_common/Config.make
index fef1b4c..d2b6950 100644
--- a/programs/python_common/Config.make
+++ b/programs/python_common/Config.make
@@ -12,7 +12,7 @@ endif
 config-script: $(CONFIG_SCRIPT) 
 
 ifdef CONFIG_SCRIPT
-	$(SHELL) $(CURDIR)/$(CONFIG_SCRIPT) $(DESTDIR) $(INSTALLDIR)
+	$(SHELL) $(CURDIR)/$(CONFIG_SCRIPT) $(DESTDIR)$(exec_prefix) $(INSTALLDIR)
 endif
 
 	mkdir -p  $(DESTDIR)/workfiles $(DESTDIR)/log $(DESTDIR)/tmp
-- 
1.5.5