summaryrefslogtreecommitdiffstats
path: root/extras
diff options
context:
space:
mode:
Diffstat (limited to 'extras')
-rw-r--r--extras/Makefile.am2
-rw-r--r--extras/ocf/Makefile.am2
2 files changed, 1 insertions, 3 deletions
diff --git a/extras/Makefile.am b/extras/Makefile.am
index 9f2237a2..47ace72e 100644
--- a/extras/Makefile.am
+++ b/extras/Makefile.am
@@ -3,7 +3,7 @@ docdir = $(datadir)/doc/glusterfs/
EditorModedir = $(docdir)/
EditorMode_DATA = glusterfs-mode.el glusterfs.vim
-SUBDIRS = init.d benchmarking hook-scripts ocf
+SUBDIRS = init.d benchmarking hook-scripts $(OCF_SUBDIR)
confdir = $(sysconfdir)/glusterfs
conf_DATA = glusterfs-logrotate
diff --git a/extras/ocf/Makefile.am b/extras/ocf/Makefile.am
index 2d741009..c49a835f 100644
--- a/extras/ocf/Makefile.am
+++ b/extras/ocf/Makefile.am
@@ -1,6 +1,5 @@
EXTRA_DIST = glusterd.in volume.in
-if WITH_OCF
# The root of the OCF resource agent hierarchy
# Per the OCF standard, it's always "lib",
# not "lib64" (even on 64-bit platforms).
@@ -10,4 +9,3 @@ ocfdir = $(prefix)/lib/ocf
radir = $(ocfdir)/resource.d/$(PACKAGE_NAME)
ra_SCRIPTS = glusterd volume
-endif