Correction of Makefile.am for the doc generation.

diff --git a/Makefile.am b/Makefile.am
index b92e7ddb0f226007f07b0c2a5da10cb7e2b17afa..1aa9f6cc882c7ac76fc1307bf8ff43c8e5b33392 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -43,9 +43,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 dcbc00f24cc5f3d04cd577d82a5765bec4d3872c..8d289146ec523188dd1ac3ab3a85006ce63c1f1c 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -28,3 +28,15 @@
 # source path
 
 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;