summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--cli/src/Makefile.am2
-rw-r--r--glusterfs.spec.in2
-rw-r--r--xlators/features/marker/utils/Makefile.am2
-rwxr-xr-xxlators/features/marker/utils/gsyncd.in2
-rw-r--r--xlators/features/marker/utils/syncdaemon/Makefile.am2
-rw-r--r--xlators/mgmt/glusterd/src/Makefile.am3
6 files changed, 7 insertions, 6 deletions
diff --git a/cli/src/Makefile.am b/cli/src/Makefile.am
index 2847f5d..31c70fc 100644
--- a/cli/src/Makefile.am
+++ b/cli/src/Makefile.am
@@ -16,7 +16,7 @@ AM_CFLAGS = -fPIC -Wall -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -D$(GF_HOST_OS)\
-I$(top_srcdir)/rpc/xdr/src\
-DDATADIR=\"$(localstatedir)\" \
-DCONFDIR=\"$(sysconfdir)/glusterfs\" $(GF_GLUSTERFS_CFLAGS)\
- -DGSYNCD_PREFIX=\"$(libexecdir)\"\
+ -DGSYNCD_PREFIX=\"$(libexecdir)/glusterfs\"\
-DSYNCDAEMON_COMPILE=$(SYNCDAEMON_COMPILE)
diff --git a/glusterfs.spec.in b/glusterfs.spec.in
index d4dedbd..df7d107 100644
--- a/glusterfs.spec.in
+++ b/glusterfs.spec.in
@@ -2,7 +2,7 @@
# a descriptive suffix to identify who owns or what the change represents
# e.g. release_version 2.MSW
%define release 1%{?dist}
-%define _libexecdir %{_prefix}/local/libexec
+%define _libexecdir %{_prefix}/local/libexec/glusterfs
# if you wish to compile an rpm without rdma support, compile like this...
# rpmbuild -ta @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz --without rdma
diff --git a/xlators/features/marker/utils/Makefile.am b/xlators/features/marker/utils/Makefile.am
index 8aefea4..84e926c 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 9bbf804..7703c7b 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 1e4f1da..03ac976 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
diff --git a/xlators/mgmt/glusterd/src/Makefile.am b/xlators/mgmt/glusterd/src/Makefile.am
index cfed2fd..1c89dba 100644
--- a/xlators/mgmt/glusterd/src/Makefile.am
+++ b/xlators/mgmt/glusterd/src/Makefile.am
@@ -16,7 +16,8 @@ AM_CFLAGS = -fPIC -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -Wall -D$(GF_HOST_OS)\
-I$(top_srcdir)/libglusterfs/src -shared -nostartfiles $(GF_CFLAGS)\
-I$(rpclibdir) -L$(xlatordir)/ -I$(CONTRIBDIR)/rbtree -I$(top_srcdir)/rpc/xdr/src\
-I$(top_srcdir)/rpc/rpc-lib/src -I$(CONTRIBDIR)/uuid -I$(top_srcdir)/contrib/md5 -DGFS_PREFIX=\"$(prefix)\" \
- -DDATADIR=\"$(localstatedir)\" -DGSYNCD_PREFIX=\"$(libexecdir)\"
+ -DDATADIR=\"$(localstatedir)\" -DGSYNCD_PREFIX=\"$(libexecdir)/glusterfs\"\
+ -DSYNCDAEMON_COMPILE=$(SYNCDAEMON_COMPILE)
CLEANFILES =