Correction of Makefile.am for the doc generation.

diff --git a/Makefile.am b/Makefile.am
index 62e21b1b5c7e9a8475073ba41e36d6eb4009ba92..7167a5e13c89395f2bc901a42d9f290c8ebcf7e3 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -48,9 +48,9 @@ dist-hook:
        rm -rf `find $(distdir) -name CVS`
 
 usr_docs:
-       (cd doc && $(MAKE) $(AM_MAKEFLAGS) usr_docs)
+       (cd doc/salome && $(MAKE) $(AM_MAKEFLAGS) usr_docs)
 
 docs:usr_docs
 
 dev_docs:
-       (cd doc && $(MAKE) $(AM_MAKEFLAGS) dev_docs)
+       (cd doc/salome && $(MAKE) $(AM_MAKEFLAGS) dev_docs)

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 6a2c2428b3e5fe8dacaee457a723779176759e4a..4d3da7060930c478eced651bc2a591779c0f9f1b 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -25,3 +25,15 @@
 #
 
 SUBDIRS= salome
+
+usr_docs:
+       @@SETX@; for d in $(SUBDIRS); do        \
+               (cd $$d && $(MAKE) $@) || exit 1;    \
+       done;
+
+docs: usr_docs
+
+dev_docs:
+       @@SETX@; for d in $(SUBDIRS); do        \
+               (cd $$d && $(MAKE) $@) || exit 1;    \
+       done;