From: vsr <vsr@opencascade.com>
Date: Thu, 30 Sep 2010 11:46:56 +0000 (+0000)
Subject: Fix make distcheck errors
X-Git-Tag: V5_1_5a1~6
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=dae09d75de281ccd0cd25026af6cc1ded85709d7;p=modules%2Fkernel.git

Fix make distcheck errors
---

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 91eeee484..6946e7718 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -23,12 +23,14 @@
 # -* Makefile *-
 # Author : Paul RASCLE (EDF)
 # Date : 06/02/2006
-# $Header$
 #
+
 include $(top_srcdir)/salome_adm/unix/make_common_starter.am
 
 SUBDIRS = salome docutils
 
+EXTRA_DIST = configuration_examples
+
 docs: usr_docs
 
 usr_docs:
@@ -36,7 +38,3 @@ usr_docs:
 
 dev_docs:
 	(cd salome && $(MAKE) $(AM_MAKEFLAGS) dev_docs)
-
-dist-hook:
-	cp -Rp $(srcdir)/configuration_examples $(distdir)
-	rm -rf $(distdir)/configuration_examples/CVS
diff --git a/doc/docutils/Makefile.am b/doc/docutils/Makefile.am
index 56246adab..a3d58c1b9 100644
--- a/doc/docutils/Makefile.am
+++ b/doc/docutils/Makefile.am
@@ -33,7 +33,7 @@ html/index.html:$(RSTFILES)
 
 endif
 
-EXTRA_DIST= html
+EXTRA_DIST = archives
 
 SPHINXOPTS      =
 SOURCEDIR       = $(srcdir)
@@ -46,7 +46,7 @@ SPHINX_PYTHONPATH = $(prefix)/lib/python$(PYTHON_VERSION)/site-packages/salome:$
 SPHINX_LD_LIBRARY_PATH = $(OMNIORB_ROOT)/lib
 
 htm:
-	mkdir -p html doctrees
+	$(MKDIR_P) html doctrees
 	PYTHONPATH=$(SPHINX_PYTHONPATH):${PYTHONPATH}; \
 	LD_LIBRARY_PATH=$(SPHINX_LD_LIBRARY_PATH):${LD_LIBRARY_PATH}; \
 	$(SPHINXBUILD) -W -b html $(ALLSPHINXOPTS) html
@@ -54,7 +54,7 @@ htm:
 	@echo "Build finished. The HTML pages are in html."
 
 latex:
-	mkdir -p latex doctrees
+	$(MKDIR_P) latex doctrees
 	PYTHONPATH=$(SPHINX_PYTHONPATH):${PYTHONPATH}; \
 	LD_LIBRARY_PATH=$(SPHINX_LD_LIBRARY_PATH):${LD_LIBRARY_PATH}; \
 	$(SPHINXBUILD) -W -b latex $(ALLSPHINXOPTS) latex
@@ -64,7 +64,7 @@ latex:
 	      "run these through (pdf)latex."
 
 html:
-	mkdir -p $@
+	$(MKDIR_P)  $@
 
 RSTFILES= \
 	index.rst \
@@ -78,15 +78,17 @@ EXTRA_DIST+= \
 	conf.py 
 
 install-data-local: html/index.html
-	$(INSTALL) -d $(pydocdir)
+	test -z $(pydocdir) || $(MKDIR_P) $(DESTDIR)$(pydocdir)
 	if test -d "html"; then b=; else b="$(srcdir)/"; fi; \
 	cp -rf $$b"html"/* $(pydocdir) ; \
 	if test -f $$b"latex"/kernelpy.pdf; then cp -f $$b"latex"/kernelpy.pdf $(pydocdir) ; fi;
 
 uninstall-local:
-	chmod -R +w $(pydocdir)
-	rm -rf $(pydocdir)/*
+	-test -d $(pydocdir) && chmod -R +w $(pydocdir) && rm -rf $(pydocdir)/*
 
 clean-local:
 	-rm -rf html latex doctrees
 	if test -d "html"; then rm -rf html ; fi
+
+disthook :
+	-test -d html && cp -Rp html $(distdir)