From adfe3931a84de61ea56bb575f02abbd4fc1f7690 Mon Sep 17 00:00:00 2001 From: vsr Date: Tue, 16 Apr 2013 08:52:10 +0000 Subject: [PATCH] Fix make distcheck problem --- doc/salome/gui/SMESH/Makefile.am | 10 +++++++++- src/Tools/YamsPlug/doc/Makefile.am | 20 +++++++++----------- 2 files changed, 18 insertions(+), 12 deletions(-) diff --git a/doc/salome/gui/SMESH/Makefile.am b/doc/salome/gui/SMESH/Makefile.am index abf0ce26f..604fed2c9 100755 --- a/doc/salome/gui/SMESH/Makefile.am +++ b/doc/salome/gui/SMESH/Makefile.am @@ -71,4 +71,12 @@ install-data-local: usr_docs cp -rp $(srcdir)/images/head.png $(DESTDIR)$(docdir)/gui/SMESH/smeshpy_doc ; uninstall-local: - rm -rf $(DESTDIR)$(docdir)/gui/SMESH + @test -d $(DESTDIR)$(guidocdir) && chmod -R +w $(DESTDIR)$(guidocdir) ; \ + for filen in `find $(DESTDIR)$(guidocdir) -mindepth 1 -maxdepth 1` dummy ; do \ + case $${filen} in \ + dummy ) ;; \ + $(DESTDIR)$(guidocdir)/yams ) ;; \ + $(DESTDIR)$(guidocdir)/head.png ) ;; \ + * ) echo "removing $${filen}" && rm -rf $${filen} ;; \ + esac ; \ + done diff --git a/src/Tools/YamsPlug/doc/Makefile.am b/src/Tools/YamsPlug/doc/Makefile.am index 005a9dd08..d32f6589d 100644 --- a/src/Tools/YamsPlug/doc/Makefile.am +++ b/src/Tools/YamsPlug/doc/Makefile.am @@ -5,7 +5,6 @@ include $(top_srcdir)/adm_local/unix/make_common_starter.am yamsdocdir=$(docdir)/gui/SMESH/yams - RSTFILES = lct.rst \ index.rst \ editHypo.rst \ @@ -13,7 +12,7 @@ RSTFILES = lct.rst \ Generics_params.rst \ Advanced_params.rst -EXTRA_DIST += $(RSTFILES) +EXTRA_DIST += $(RSTFILES) images # You can set these variables from the command line. SPHINXOPTS = @@ -21,7 +20,7 @@ SOURCEDIR = $(srcdir) SPHINXBUILD = sphinx-build PAPER = BUILDDIR = _build -CONF_FILE_DIR = . +CONF_FILE_DIR = $(top_builddir)/src/Tools/YamsPlug/doc # Internal variables. PAPEROPT_a4 = -D latex_paper_size=a4 @@ -30,9 +29,6 @@ ALLSPHINXOPTS = -d $(BUILDDIR)/doctrees -c $(CONF_FILE_DIR) $(PAPEROPT_$(PAPER .PHONY: help clean html latexpdf -all: - make html - help: @echo "Please use \`make ' where is one of" @echo " html to make standalone HTML files" @@ -52,14 +48,16 @@ help: @echo " linkcheck to check all external links for integrity" @echo " doctest to run all doctests embedded in the documentation (if enabled)" -install-data-local: all - test -z $(yamsdocdir) || mkdir -p $(yamsdocdir) - cp -rf $(BUILDDIR)/html/* $(yamsdocdir) ; +install-data-local: $(BUILDDIR)/html/index.html + -test -z $(yamsdocdir) || mkdir -p $(yamsdocdir) && cp -rf $(BUILDDIR)/html/* $(yamsdocdir) ; -clean: +uninstall-local: + -test -d $(yamsdocdir) && chmod -R +w $(yamsdocdir) && rm -rf $(yamsdocdir)/* + +clean-local: -rm -rf $(BUILDDIR)/* -html: +$(BUILDDIR)/html/index.html: $(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html @echo @echo "Build finished. The HTML pages are in $(BUILDDIR)/html."