Module: xenomai-forge
Branch: next
Commit: f8565c48731dabbeba2e0336acadbc8cb1ed2f79
URL:    
http://git.xenomai.org/?p=xenomai-forge.git;a=commit;h=f8565c48731dabbeba2e0336acadbc8cb1ed2f79

Author: Philippe Gerum <r...@xenomai.org>
Date:   Thu Jun 26 16:27:34 2014 +0200

doc: fix install rules

---

 doc/Makefile.am          |    6 ++++++
 doc/Makefile.in          |   13 ++++++++-----
 doc/asciidoc/Makefile.am |    2 +-
 doc/asciidoc/Makefile.in |    6 +++---
 doc/doxygen/Makefile.am  |    2 +-
 doc/doxygen/Makefile.in  |    6 +++---
 doc/install-dist.rules   |    4 ++--
 7 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/doc/Makefile.am b/doc/Makefile.am
index a330153..2a173ef 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -6,10 +6,16 @@ doxygen asciidoc: FORCE
        $(MAKE) -C $@
 
 resync prebuild: FORCE
+if XENO_BUILD_DOC
        @if test \! -e $(RESYNC_SCRIPT) -o \! -e $(top_srcdir)/.git ; then \
                echo "$@ wants $top_srcdir to be a GIT working tree." ; \
        else \
                srcdir=$(srcdir) $(RESYNC_SCRIPT) ; \
        fi
+else
+       @echo "build tree not configured for regenerating documentation"
+       @echo "reconfigure with --enable-doc-build"
+       @/bin/false
+endif
 
 .PHONY: FORCE
diff --git a/doc/Makefile.in b/doc/Makefile.in
index 5f0ead6..699fc51 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -656,11 +656,14 @@ doxygen asciidoc: FORCE
        $(MAKE) -C $@
 
 resync prebuild: FORCE
-       @if test \! -e $(RESYNC_SCRIPT) -o \! -e $(top_srcdir)/.git ; then \
-               echo "$@ wants $top_srcdir to be a GIT working tree." ; \
-       else \
-               srcdir=$(srcdir) $(RESYNC_SCRIPT) ; \
-       fi
+@XENO_BUILD_DOC_TRUE@  @if test \! -e $(RESYNC_SCRIPT) -o \! -e 
$(top_srcdir)/.git ; then \
+@XENO_BUILD_DOC_TRUE@          echo "$@ wants $top_srcdir to be a GIT working 
tree." ; \
+@XENO_BUILD_DOC_TRUE@  else \
+@XENO_BUILD_DOC_TRUE@          srcdir=$(srcdir) $(RESYNC_SCRIPT) ; \
+@XENO_BUILD_DOC_TRUE@  fi
+@XENO_BUILD_DOC_FALSE@ @echo "build tree not configured for regenerating 
documentation"
+@XENO_BUILD_DOC_FALSE@ @echo "reconfigure with --enable-doc-build"
+@XENO_BUILD_DOC_FALSE@ @/bin/false
 
 .PHONY: FORCE
 
diff --git a/doc/asciidoc/Makefile.am b/doc/asciidoc/Makefile.am
index ee67405..bbd5649 100644
--- a/doc/asciidoc/Makefile.am
+++ b/doc/asciidoc/Makefile.am
@@ -54,7 +54,7 @@ EXTRA_DIST :=                         \
        $(MAN_DOCS:%.1:%.adoc)
 
 if !XENO_BUILD_DOC
-HTML_DOCSDIR = $(srcdir)/../prebuilt/html/
+HTML_DOCSDIR = $(srcdir)/../prebuilt/
 PDF_DOCSDIR = $(srcdir)/../prebuilt/pdf/
 MAN_DOCSDIR = $(srcdir)/../prebuilt/man/
 else
diff --git a/doc/asciidoc/Makefile.in b/doc/asciidoc/Makefile.in
index 5ca44a4..8f773ec 100644
--- a/doc/asciidoc/Makefile.in
+++ b/doc/asciidoc/Makefile.in
@@ -348,7 +348,7 @@ EXTRA_DIST := \
        plaintext.xsl                   \
        $(MAN_DOCS:%.1:%.adoc)
 
-@XENO_BUILD_DOC_FALSE@HTML_DOCSDIR = $(srcdir)/../prebuilt/html/
+@XENO_BUILD_DOC_FALSE@HTML_DOCSDIR = $(srcdir)/../prebuilt/
 @XENO_BUILD_DOC_TRUE@HTML_DOCSDIR = ./
 @XENO_BUILD_DOC_FALSE@PDF_DOCSDIR = $(srcdir)/../prebuilt/pdf/
 @XENO_BUILD_DOC_TRUE@PDF_DOCSDIR = ./
@@ -594,7 +594,7 @@ uninstall-am: uninstall-local
 install-htmldocs: $(HTML_DOCS:%=$(HTML_DOCSDIR)%)
        docs="$(HTML_DOCS)"; abs_builddir=$$PWD; \
        for dir in $$docs; do \
-           dest=$(DESTDIR)$(docdir)/html/$$dir; \
+           dest=$(DESTDIR)$(docdir)/$$dir; \
            $(mkinstalldirs) $$dest; \
            abs_dest=`cd $$dest && pwd` ; \
            cd $(HTML_DOCSDIR)$$dir || exit 1; \
@@ -655,7 +655,7 @@ dist-docs-hook: all-local dist-htmldocs dist-mandocs 
dist-pdfdocs
 # To make distcheck happy.
 uninstall-docs:
        if test -n "$(HTML_DOCS)" -o -n "$(PDF_DOCS)" -o -n "$(MAN_DOCS)"; then 
\
-           targets="$(HTML_DOCS:%=$(DESTDIR)$(docdir)/html/%) \
+           targets="$(HTML_DOCS:%=$(DESTDIR)$(docdir)/%) \
                $(PDF_DOCS:%=$(DESTDIR)$(docdir)/pdf/%) \
                $(MAN_DOCS:%=$(DESTDIR)$(docdir)/man/%)"; \
            for t in $$targets; do \
diff --git a/doc/doxygen/Makefile.am b/doc/doxygen/Makefile.am
index 066821d..b283d1b 100644
--- a/doc/doxygen/Makefile.am
+++ b/doc/doxygen/Makefile.am
@@ -3,7 +3,7 @@ PDF_DOCS  = xeno3prm.pdf
 EXTRA_DIST = xeno3prm-common.conf.in xeno3prm-html.conf.in 
xeno3prm-latex.conf.in
 
 if !XENO_BUILD_DOC
-HTML_DOCSDIR = $(srcdir)/../prebuilt/html/
+HTML_DOCSDIR = $(srcdir)/../prebuilt/
 PDF_DOCSDIR = $(srcdir)/../prebuilt/pdf/
 
 html pdf:
diff --git a/doc/doxygen/Makefile.in b/doc/doxygen/Makefile.in
index 7429fd7..02c700a 100644
--- a/doc/doxygen/Makefile.in
+++ b/doc/doxygen/Makefile.in
@@ -300,7 +300,7 @@ top_srcdir = @top_srcdir@
 HTML_DOCS = html/xeno3prm html/xeno3prm/search
 PDF_DOCS = xeno3prm.pdf
 EXTRA_DIST = xeno3prm-common.conf.in xeno3prm-html.conf.in 
xeno3prm-latex.conf.in
-@XENO_BUILD_DOC_FALSE@HTML_DOCSDIR = $(srcdir)/../prebuilt/html/
+@XENO_BUILD_DOC_FALSE@HTML_DOCSDIR = $(srcdir)/../prebuilt/
 @XENO_BUILD_DOC_TRUE@HTML_DOCSDIR = ./
 @XENO_BUILD_DOC_FALSE@PDF_DOCSDIR = $(srcdir)/../prebuilt/pdf/
 @XENO_BUILD_DOC_TRUE@PDF_DOCSDIR = ./
@@ -541,7 +541,7 @@ uninstall-am: uninstall-local
 install-htmldocs: $(HTML_DOCS:%=$(HTML_DOCSDIR)%)
        docs="$(HTML_DOCS)"; abs_builddir=$$PWD; \
        for dir in $$docs; do \
-           dest=$(DESTDIR)$(docdir)/html/$$dir; \
+           dest=$(DESTDIR)$(docdir)/$$dir; \
            $(mkinstalldirs) $$dest; \
            abs_dest=`cd $$dest && pwd` ; \
            cd $(HTML_DOCSDIR)$$dir || exit 1; \
@@ -602,7 +602,7 @@ dist-docs-hook: all-local dist-htmldocs dist-mandocs 
dist-pdfdocs
 # To make distcheck happy.
 uninstall-docs:
        if test -n "$(HTML_DOCS)" -o -n "$(PDF_DOCS)" -o -n "$(MAN_DOCS)"; then 
\
-           targets="$(HTML_DOCS:%=$(DESTDIR)$(docdir)/html/%) \
+           targets="$(HTML_DOCS:%=$(DESTDIR)$(docdir)/%) \
                $(PDF_DOCS:%=$(DESTDIR)$(docdir)/pdf/%) \
                $(MAN_DOCS:%=$(DESTDIR)$(docdir)/man/%)"; \
            for t in $$targets; do \
diff --git a/doc/install-dist.rules b/doc/install-dist.rules
index 423b44a..1be7f2f 100644
--- a/doc/install-dist.rules
+++ b/doc/install-dist.rules
@@ -18,7 +18,7 @@ GEN_DOC_DIST_ROOT=$(doc_top_distdir)/doc/prebuilt
 install-htmldocs: $(HTML_DOCS:%=$(HTML_DOCSDIR)%)
        docs="$(HTML_DOCS)"; abs_builddir=$$PWD; \
        for dir in $$docs; do \
-           dest=$(DESTDIR)$(docdir)/html/$$dir; \
+           dest=$(DESTDIR)$(docdir)/$$dir; \
            $(mkinstalldirs) $$dest; \
            abs_dest=`cd $$dest && pwd` ; \
            cd $(HTML_DOCSDIR)$$dir || exit 1; \
@@ -79,7 +79,7 @@ dist-docs-hook: all-local dist-htmldocs dist-mandocs 
dist-pdfdocs
 # To make distcheck happy.
 uninstall-docs:
        if test -n "$(HTML_DOCS)" -o -n "$(PDF_DOCS)" -o -n "$(MAN_DOCS)"; then 
\
-           targets="$(HTML_DOCS:%=$(DESTDIR)$(docdir)/html/%) \
+           targets="$(HTML_DOCS:%=$(DESTDIR)$(docdir)/%) \
                $(PDF_DOCS:%=$(DESTDIR)$(docdir)/pdf/%) \
                $(MAN_DOCS:%=$(DESTDIR)$(docdir)/man/%)"; \
            for t in $$targets; do \


_______________________________________________
Xenomai-git mailing list
Xenomai-git@xenomai.org
http://www.xenomai.org/mailman/listinfo/xenomai-git

Reply via email to