]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Makefile: only reset docdir if it's not already defined
authorSage Weil <sage@newdream.net>
Fri, 7 Oct 2011 20:13:29 +0000 (13:13 -0700)
committerSage Weil <sage@newdream.net>
Fri, 7 Oct 2011 20:13:29 +0000 (13:13 -0700)
This is only for old versions of automake, and won't work for ancient
SuSe.

Signed-off-by: Sage Weil <sage@newdream.net>
src/Makefile.am

index 16df1aef662cf4edd6f06e4333d361c6ab8a6fdb..2d13d72e71cd4b9a489b9b2498369f75fcfbfc0b 100644 (file)
@@ -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