From 086ef357b64d4b7e5340226ada639813b1efd101 Mon Sep 17 00:00:00 2001 From: Kaushik BV Date: Sun, 13 Mar 2011 23:10:14 +0000 Subject: Gsyncd: Include a directory glusterfs in the libexecdir, so that it is not cumbersome with other scripts Signed-off-by: Kaushik BV Signed-off-by: Vijay Bellur BUG: 2477 (Cleanup up the installation of geo-replication scripts.) URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=2477 --- xlators/features/marker/utils/Makefile.am | 2 +- xlators/features/marker/utils/gsyncd.in | 2 +- xlators/features/marker/utils/syncdaemon/Makefile.am | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'xlators/features/marker/utils') diff --git a/xlators/features/marker/utils/Makefile.am b/xlators/features/marker/utils/Makefile.am index 8aefea401..84e926c00 100644 --- a/xlators/features/marker/utils/Makefile.am +++ b/xlators/features/marker/utils/Makefile.am @@ -1,6 +1,6 @@ SUBDIRS = syncdaemon -gsyncddir = $(libexecdir) +gsyncddir = $(libexecdir)/glusterfs gsyncd_SCRIPTS = gsyncd diff --git a/xlators/features/marker/utils/gsyncd.in b/xlators/features/marker/utils/gsyncd.in index 9bbf8041f..7703c7b59 100755 --- a/xlators/features/marker/utils/gsyncd.in +++ b/xlators/features/marker/utils/gsyncd.in @@ -4,4 +4,4 @@ prefix="@prefix@" exec_prefix="@exec_prefix@" libexecdir=`eval echo "@libexecdir@"` -PYTHONPATH="$libexecdir"/python exec @PYTHON@ -c "from syncdaemon import gsyncd; gsyncd.main()" -c @sysconfdir@/glusterfs/gsyncd.conf "$@" +PYTHONPATH="$libexecdir"/glusterfs/python exec @PYTHON@ -c "from syncdaemon import gsyncd; gsyncd.main()" -c @sysconfdir@/glusterfs/gsyncd.conf "$@" diff --git a/xlators/features/marker/utils/syncdaemon/Makefile.am b/xlators/features/marker/utils/syncdaemon/Makefile.am index 1e4f1dac5..03ac97625 100644 --- a/xlators/features/marker/utils/syncdaemon/Makefile.am +++ b/xlators/features/marker/utils/syncdaemon/Makefile.am @@ -1,4 +1,4 @@ -syncdaemondir = $(libexecdir)/python/syncdaemon +syncdaemondir = $(libexecdir)/glusterfs/python/syncdaemon syncdaemon_PYTHON = gconf.py gsyncd.py __init__.py master.py README.md repce.py resource.py configinterface.py syncdutils.py -- cgit