From a7c7a274894ad7fed663be21e6acbf51a3b8fbc0 Mon Sep 17 00:00:00 2001 From: Olly Betts Date: Wed, 3 Feb 2016 16:18:10 +1300 Subject: [PATCH] Fix to install docs when not in maintainer-mode --- xapian-bindings/csharp/Makefile.am | 4 ++-- xapian-bindings/java/Makefile.am | 4 ++-- xapian-bindings/lua/Makefile.am | 4 ++-- xapian-bindings/perl/Makefile.am | 4 ++-- xapian-bindings/php/Makefile.am | 4 ++-- xapian-bindings/ruby/Makefile.am | 6 +++--- xapian-bindings/tcl8/Makefile.am | 4 ++-- 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/xapian-bindings/csharp/Makefile.am b/xapian-bindings/csharp/Makefile.am index 2f2a6f282..8ac3d1dd2 100644 --- a/xapian-bindings/csharp/Makefile.am +++ b/xapian-bindings/csharp/Makefile.am @@ -163,10 +163,10 @@ dist_exampledata_DATA =\ docs/examples/SimpleExpand.cs docdatadir = $(docdir)/csharp -EXTRA_DIST += docs/index.html +docdata_DATA = docs/index.html if DOCUMENTATION_RULES -docdata_DATA = docs/index.html +BUILT_SOURCES += docs/index.html .rst.html: -case "$@" in */*) d=`echo "$@"|sed 's,/[^/]*$$,,'`; $(MKDIR_P) "$$d" ;; esac diff --git a/xapian-bindings/java/Makefile.am b/xapian-bindings/java/Makefile.am index d6b38f514..292d30852 100644 --- a/xapian-bindings/java/Makefile.am +++ b/xapian-bindings/java/Makefile.am @@ -191,10 +191,10 @@ dist_exampledata_DATA =\ docs/examples/SimpleIndex.java docdatadir = $(docdir)/java -EXTRA_DIST += docs/index.html +docdata_DATA = docs/index.html if DOCUMENTATION_RULES -docdata_DATA = docs/index.html +BUILT_SOURCES += docs/index.html .rst.html: -case "$@" in */*) d=`echo "$@"|sed 's,/[^/]*$$,,'`; $(MKDIR_P) "$$d" ;; esac diff --git a/xapian-bindings/lua/Makefile.am b/xapian-bindings/lua/Makefile.am index 4f1b7a920..63d8d5199 100644 --- a/xapian-bindings/lua/Makefile.am +++ b/xapian-bindings/lua/Makefile.am @@ -61,10 +61,10 @@ dist_exampledata_DATA = \ docs/examples/simplesearch.lua docdatadir = $(docdir)/lua -EXTRA_DIST += docs/index.html +docdata_DATA = docs/index.html if DOCUMENTATION_RULES -docdata_DATA = docs/index.html +BUILT_SOURCES += docs/index.html .rst.html: -case "$@" in */*) d=`echo "$@"|sed 's,/[^/]*$$,,'`; $(MKDIR_P) "$$d" ;; esac diff --git a/xapian-bindings/perl/Makefile.am b/xapian-bindings/perl/Makefile.am index 50d4deab3..c28b34cb3 100644 --- a/xapian-bindings/perl/Makefile.am +++ b/xapian-bindings/perl/Makefile.am @@ -166,10 +166,10 @@ endif MAINTAINERCLEANFILES = $(BUILT_SOURCES) docdatadir = $(docdir)/perl -EXTRA_DIST += docs/index.html +docdata_DATA = docs/index.html if DOCUMENTATION_RULES -docdata_DATA = docs/index.html +BUILT_SOURCES += docs/index.html docs/index.html: Xapian.pm $(MKDIR_P) docs diff --git a/xapian-bindings/php/Makefile.am b/xapian-bindings/php/Makefile.am index 91b039f31..35fb6bebd 100644 --- a/xapian-bindings/php/Makefile.am +++ b/xapian-bindings/php/Makefile.am @@ -95,10 +95,10 @@ dist_exampledata_DATA =\ docs/examples/simplematchdecider.php5 docdatadir = $(docdir)/php -EXTRA_DIST += docs/index.html +docdata_DATA = docs/index.html if DOCUMENTATION_RULES -docdata_DATA = docs/index.html +BUILT_SOURCES += docs/index.html .rst.html: -case "$@" in */*) d=`echo "$@"|sed 's,/[^/]*$$,,'`; $(MKDIR_P) "$$d" ;; esac diff --git a/xapian-bindings/ruby/Makefile.am b/xapian-bindings/ruby/Makefile.am index 10e89d058..49a25bb66 100644 --- a/xapian-bindings/ruby/Makefile.am +++ b/xapian-bindings/ruby/Makefile.am @@ -82,13 +82,11 @@ uninstall-local: done docdatadir = $(docdir)/ruby -EXTRA_DIST += docs/index.html +dist_docdata_DATA = docs/index.html EXTRA_DIST += generate-rdoc-stubs if DOCUMENTATION_RULES -docdata_DATA = docs/index.html - BUILT_SOURCES += docs/rdocs/index.html docs/rdocs: docs/rdocs/index.html @@ -100,6 +98,8 @@ docs/rdocs/index.html: docs/xapian.rb rm -rf docs/rdocs cd docs && $(RDOC) --op rdocs xapian.rb +BUILT_SOURCES += docs/index.html + .rst.html: -case "$@" in */*) d=`echo "$@"|sed 's,/[^/]*$$,,'`; $(MKDIR_P) "$$d" ;; esac $(RST2HTML) --exit-status=warning $< $@ diff --git a/xapian-bindings/tcl8/Makefile.am b/xapian-bindings/tcl8/Makefile.am index 003337175..f7f962039 100644 --- a/xapian-bindings/tcl8/Makefile.am +++ b/xapian-bindings/tcl8/Makefile.am @@ -66,10 +66,10 @@ dist_exampledata_DATA = \ docs/examples/simplesearch.tcl docdatadir = $(docdir)/tcl8 -EXTRA_DIST += docs/index.html +dist_docdata_DATA = docs/index.html if DOCUMENTATION_RULES -dist_docdata_DATA = docs/index.html +BUILT_SOURCES += docs/index.html .rst.html: -case "$@" in */*) d=`echo "$@"|sed 's,/[^/]*$$,,'`; $(MKDIR_P) "$$d" ;; esac -- 2.11.4.GIT