From e5db7b243c23f3ee0344ba6e7dfa9b015ef11b82 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Fri, 7 Oct 2011 13:13:29 -0700 Subject: [PATCH] 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 --- src/Makefile.am | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/Makefile.am b/src/Makefile.am index 16df1aef662cf..2d13d72e71cd4 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 -- 2.39.5