PR: bug detected by OCN

diff --git a/bin/Makefile.am b/bin/Makefile.am
index eecb208a3fc6e1149441e635716e6b8780225057..b738ef9dbe943bee198d7ad293cf2c0bbf0037b3 100644 (file)
--- a/bin/Makefile.am
+++ b/bin/Makefile.am
@@ -53,7 +53,7 @@ clean-local:
 install-exec-local:
        $(INSTALL) -d $(salomescriptdir)
        cp -r $(srcdir)/appliskel $(salomescriptdir)
-       find $(salomescriptdir) -name CVS | xargs rm -rf
+       find $(salomescriptdir) -name CVS -prune -exec rm -rf {} \;
 
 uninstall-local:
        find $(salomescriptdir)/appliskel -exec chmod +w {} \;

diff --git a/src/SALOMEDSClient/Makefile.am b/src/SALOMEDSClient/Makefile.am
index 6593e94e49afa43d808dd7e58da796265ff20a4e..f74e2115189358f0e512314fa0d4a81c1e2958fc 100644 (file)
--- a/src/SALOMEDSClient/Makefile.am
+++ b/src/SALOMEDSClient/Makefile.am
@@ -58,6 +58,7 @@ salomeinclude_HEADERS=\
 
 # This local variable defines the list of CPPFLAGS common to all target in this package.
 COMMON_CPPFLAGS= \
+       @BOOST_CPPFLAGS@ \
        -I$(top_builddir)/salome_adm/unix \
        -I$(top_builddir)/idl \
        @CORBA_CXXFLAGS@ @CORBA_INCLUDES@