summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKacper Kowalik (Xarthisius) <xarthisius.kk@gmail.com>2012-09-24 10:48:35 +0200
committerAnand Avati <avati@redhat.com>2013-02-07 16:38:06 -0800
commit779004dbcd79e34a0c7ce73f574419b40ccade27 (patch)
tree248efbb8943de04bffe724f72e71c884666c06c3
parentd3e7881ecdba2124115de6666e48f34ce267d30d (diff)
Respect autotools docdir variable
Change-Id: If20d0806a925b880e0ba9bbc66604cae6c51ce6b BUG: 859861 Signed-off-by: Kacper Kowalik (Xarthisius) <xarthisius.kk@gmail.com> Reviewed-on: http://review.gluster.org/3971 Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Anand Avati <avati@redhat.com>
-rw-r--r--extras/Makefile.am3
-rw-r--r--extras/benchmarking/Makefile.am4
2 files changed, 2 insertions, 5 deletions
diff --git a/extras/Makefile.am b/extras/Makefile.am
index 47ace72e510..a88da83cc1e 100644
--- a/extras/Makefile.am
+++ b/extras/Makefile.am
@@ -1,6 +1,5 @@
-docdir = $(datadir)/doc/glusterfs/
-EditorModedir = $(docdir)/
+EditorModedir = $(docdir)
EditorMode_DATA = glusterfs-mode.el glusterfs.vim
SUBDIRS = init.d benchmarking hook-scripts $(OCF_SUBDIR)
diff --git a/extras/benchmarking/Makefile.am b/extras/benchmarking/Makefile.am
index 04cc06182ab..bfcc59277a5 100644
--- a/extras/benchmarking/Makefile.am
+++ b/extras/benchmarking/Makefile.am
@@ -1,7 +1,5 @@
-docdir = $(datadir)/doc/$(PACKAGE_NAME)/benchmarking
-
-benchmarkingdir = $(docdir)
+benchmarkingdir = $(docdir)/benchmarking
benchmarking_DATA = rdd.c glfs-bm.c README launch-script.sh local-script.sh