diff options
| -rw-r--r-- | cli/src/Makefile.am | 2 | ||||
| -rw-r--r-- | glusterfs.spec.in | 2 | ||||
| -rw-r--r-- | xlators/features/marker/utils/Makefile.am | 2 | ||||
| -rwxr-xr-x | xlators/features/marker/utils/gsyncd.in | 2 | ||||
| -rw-r--r-- | xlators/features/marker/utils/syncdaemon/Makefile.am | 2 | ||||
| -rw-r--r-- | xlators/mgmt/glusterd/src/Makefile.am | 3 |
6 files changed, 7 insertions, 6 deletions
diff --git a/cli/src/Makefile.am b/cli/src/Makefile.am index 2847f5d78..31c70fc1c 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 d4dedbd98..df7d107c6 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 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 diff --git a/xlators/mgmt/glusterd/src/Makefile.am b/xlators/mgmt/glusterd/src/Makefile.am index cfed2fd4b..1c89dba97 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 = |