summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarshavardhana Ranganath <harsha@gluster.com>2009-12-04 20:48:02 +0000
committerAnand V. Avati <avati@dev.gluster.com>2009-12-06 09:28:48 -0800
commit2449ed76ee63375846e62656e98cb88cdfce51ed (patch)
tree6cdd9ceaa46e37ffcda403bcbfcb874ee3e6a2a4
parent9f37cca2ced2628f480fbdcf2071ca4b16b3549e (diff)
glusterfs-volgen honours now build level prefix
Signed-off-by: Harshavardhana <harsha@gluster.com> Signed-off-by: Anand V. Avati <avati@dev.gluster.com> BUG: 437 (Fix critical argument validation check on Fedora11 systems) URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=437
-rw-r--r--configure.ac1
-rwxr-xr-xextras/volgen/glusterfs-volgen.in (renamed from extras/volgen/glusterfs-volgen)6
2 files changed, 5 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac
index 25367a9..a02f188 100644
--- a/configure.ac
+++ b/configure.ac
@@ -125,6 +125,7 @@ AC_CONFIG_FILES([Makefile
extras/init.d/glusterfsd-SuSE
extras/benchmarking/Makefile
extras/volgen/Makefile
+ extras/volgen/glusterfs-volgen
glusterfs.spec])
AC_CANONICAL_HOST
diff --git a/extras/volgen/glusterfs-volgen b/extras/volgen/glusterfs-volgen.in
index 5275b90..5d9c579 100755
--- a/extras/volgen/glusterfs-volgen
+++ b/extras/volgen/glusterfs-volgen.in
@@ -3,8 +3,10 @@
import getopt, sys, os, string
from optparse import OptionParser,OptionGroup,make_option
-if not "/usr/share/glusterfs" in sys.path:
- sys.path.append("/usr/share/glusterfs")
+prefix = "@prefix@"
+
+if not (prefix + "/share/glusterfs") in sys.path:
+ sys.path.append(prefix + "/share/glusterfs")
from CreateVolfile import *
from CreateBooster import *