summaryrefslogtreecommitdiffstats
path: root/extras
diff options
context:
space:
mode:
Diffstat (limited to 'extras')
-rw-r--r--extras/Makefile.am4
-rw-r--r--extras/geo-rep/Makefile.am2
-rw-r--r--extras/hook-scripts/Makefile.am2
3 files changed, 5 insertions, 3 deletions
diff --git a/extras/Makefile.am b/extras/Makefile.am
index d54f7507210..ba2bef31420 100644
--- a/extras/Makefile.am
+++ b/extras/Makefile.am
@@ -1,5 +1,5 @@
-gsyncddir = $(libexecdir)/glusterfs
-gsyncd_SCRIPTS = peer_add_secret_pub
+addonexecdir = $(libexecdir)/glusterfs
+addonexec_SCRIPTS = peer_add_secret_pub
EditorModedir = $(docdir)
EditorMode_DATA = glusterfs-mode.el glusterfs.vim
diff --git a/extras/geo-rep/Makefile.am b/extras/geo-rep/Makefile.am
index e0aab77644e..7ebede32686 100644
--- a/extras/geo-rep/Makefile.am
+++ b/extras/geo-rep/Makefile.am
@@ -5,7 +5,7 @@ scripts_DATA = gsync-upgrade.sh generate-gfid-file.sh get-gfid.sh \
scripts_PROGRAMS = gsync-sync-gfid
gsync_sync_gfid_CFLAGS = $(GF_CFLAGS) -Wall -I$(top_srcdir)/libglusterfs/src
gsync_sync_gfid_LDFLAGS = $(GF_LDFLAGS)
-gsync_sync_gfid_LDADD = $(GF_LIBS) $(top_builddir)/libglusterfs/src/libglusterfs.la
+gsync_sync_gfid_LDADD = $(GF_LDADD) $(top_builddir)/libglusterfs/src/libglusterfs.la
gsync_sync_gfid_SOURCES = gsync-sync-gfid.c
gsync_sync_gfid_CPPFLAGS = $(GF_CPPFLAGS) -I$(top_srcdir)/libglusterfs/src
diff --git a/extras/hook-scripts/Makefile.am b/extras/hook-scripts/Makefile.am
index fa126f90591..771b37e3fdf 100644
--- a/extras/hook-scripts/Makefile.am
+++ b/extras/hook-scripts/Makefile.am
@@ -2,4 +2,6 @@ EXTRA_DIST = S40ufo-stop.py S56glusterd-geo-rep-create-post.sh
SUBDIRS = add-brick set start stop reset
scriptsdir = $(GLUSTERD_WORKDIR)/hooks/1/gsync-create/post/
+if USE_GEOREP
scripts_SCRIPTS = S56glusterd-geo-rep-create-post.sh
+endif