From: Sage Weil <sage@newdream.net>
Date: Fri, 7 Oct 2011 20:13:29 +0000 (-0700)
Subject: Makefile: only reset docdir if it's not already defined
X-Git-Tag: v0.37~38^2~8
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e5db7b243c23f3ee0344ba6e7dfa9b015ef11b82;p=ceph.git

Makefile: only reset docdir if it's not already defined

This is only for old versions of automake, and won't work for ancient
SuSe.

Signed-off-by: Sage Weil <sage@newdream.net>
---

diff --git a/src/Makefile.am b/src/Makefile.am
index 16df1aef662c..2d13d72e71cd 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -724,7 +724,9 @@ EXTRA_DIST = $(srcdir)/verify-mds-journal.sh $(srcdir)/vstart.sh $(srcdir)/stop.
 	$(ceph_tool_gui_DATA)
 
 # work around old versions of automake that don't define $docdir
-docdir = ${datadir}/doc/ceph
+# NOTE: this won't work on suse, where docdir is /usr/share/doc/packages/$package.
+docdir ?= ${datadir}/doc/ceph
+
 doc_DATA = $(srcdir)/sample.ceph.conf
 doc_SCRIPTS = sample.fetch_config