diff options
| author | Sage Weil <sage@newdream.net> | 2011-10-07 22:13:29 +0200 |
|---|---|---|
| committer | Sage Weil <sage@newdream.net> | 2011-10-07 22:13:29 +0200 |
| commit | e5db7b243c23f3ee0344ba6e7dfa9b015ef11b82 (patch) | |
| tree | c2e434a9dae645857a36e81b3421419456f5f736 | |
| parent | crushtool: fix --weight arg parsing (diff) | |
| download | ceph-e5db7b243c23f3ee0344ba6e7dfa9b015ef11b82.tar.xz ceph-e5db7b243c23f3ee0344ba6e7dfa9b015ef11b82.zip | |
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>
| -rw-r--r-- | src/Makefile.am | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 16df1aef662..2d13d72e71c 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 |