Module: xenomai-forge
Branch: next
Commit: 0aa8e02339a6f72d289c5851ba5eaaf719beb8a8
URL:
http://git.xenomai.org/?p=xenomai-forge.git;a=commit;h=0aa8e02339a6f72d289c5851ba5eaaf719beb8a8
Author: Philippe Gerum <r...@xenomai.org>
Date: Thu Jul 3 16:13:54 2014 +0200
build: fix --disable-doc-install
---
doc/asciidoc/Makefile.am | 10 +++++++---
doc/asciidoc/Makefile.in | 9 +++++----
doc/doxygen/Makefile.am | 8 ++++++--
doc/doxygen/Makefile.in | 7 ++++---
4 files changed, 22 insertions(+), 12 deletions(-)
diff --git a/doc/asciidoc/Makefile.am b/doc/asciidoc/Makefile.am
index bbd5649..96834b4 100644
--- a/doc/asciidoc/Makefile.am
+++ b/doc/asciidoc/Makefile.am
@@ -108,13 +108,17 @@ endif
include $(top_srcdir)/doc/install-dist.rules
+if XENO_INSTALL_DOC
install-data-local: install-docs-local
+uninstall-local: uninstall-docs
+else
+install-data-local:
+uninstall-local:
+endif
dist-hook: dist-docs-hook
-uninstall-local: uninstall-docs
+distclean-local: clean-local
clean-local:
$(RM) -R $(HTML_DOCS) $(PDF_DOCS) $(TXT_DOCS) $(tmpdir)
-
-distclean-local: clean-local
diff --git a/doc/asciidoc/Makefile.in b/doc/asciidoc/Makefile.in
index 8f773ec..264ea6c 100644
--- a/doc/asciidoc/Makefile.in
+++ b/doc/asciidoc/Makefile.in
@@ -664,17 +664,18 @@ uninstall-docs:
done; \
fi
-install-data-local: install-docs-local
+@XENO_INSTALL_DOC_TRUE@install-data-local: install-docs-local
+@XENO_INSTALL_DOC_TRUE@uninstall-local: uninstall-docs
+@XENO_INSTALL_DOC_FALSE@install-data-local:
+@XENO_INSTALL_DOC_FALSE@uninstall-local:
dist-hook: dist-docs-hook
-uninstall-local: uninstall-docs
+distclean-local: clean-local
clean-local:
$(RM) -R $(HTML_DOCS) $(PDF_DOCS) $(TXT_DOCS) $(tmpdir)
-distclean-local: clean-local
-
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
diff --git a/doc/doxygen/Makefile.am b/doc/doxygen/Makefile.am
index b283d1b..75af9ff 100644
--- a/doc/doxygen/Makefile.am
+++ b/doc/doxygen/Makefile.am
@@ -41,8 +41,12 @@ endif
include $(top_srcdir)/doc/install-dist.rules
+if XENO_INSTALL_DOC
install-data-local: install-docs-local
+uninstall-local: uninstall-docs
+else
+install-data-local:
+uninstall-local:
+endif
dist-hook: dist-docs-hook
-
-uninstall-local: uninstall-docs
diff --git a/doc/doxygen/Makefile.in b/doc/doxygen/Makefile.in
index 02c700a..a51490a 100644
--- a/doc/doxygen/Makefile.in
+++ b/doc/doxygen/Makefile.in
@@ -611,12 +611,13 @@ uninstall-docs:
done; \
fi
-install-data-local: install-docs-local
+@XENO_INSTALL_DOC_TRUE@install-data-local: install-docs-local
+@XENO_INSTALL_DOC_TRUE@uninstall-local: uninstall-docs
+@XENO_INSTALL_DOC_FALSE@install-data-local:
+@XENO_INSTALL_DOC_FALSE@uninstall-local:
dist-hook: dist-docs-hook
-uninstall-local: uninstall-docs
-
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
_______________________________________________
Xenomai-git mailing list
Xenomai-git@xenomai.org
http://www.xenomai.org/mailman/listinfo/xenomai-git
