DCQ : Merge with Ecole_ete_a6.

[modules/yacs.git] / salome_adm / unix / make_conclude.in

diff --git a/salome_adm/unix/make_conclude.in b/salome_adm/unix/make_conclude.in
index cc2fb2be665a63113cb4baea8b4b8f0d193d71ba..b791f484d28cbc6af3e46c0752c957c7cc341270 100644 (file)
--- a/salome_adm/unix/make_conclude.in
+++ b/salome_adm/unix/make_conclude.in
@@ -95,7 +95,7 @@ $(BIN:%=$(top_builddir)/bin/salome/%) $(TEST_PROGS:%=$(top_builddir)/bin/salome/
        ln -sf $(CURDIR)/$< $@
 
 $(BIN) $(TEST_PROGS): %: %.lo $(BIN_OBJ)
-       $(CXX) $(CPPFLAGS) $(CXXFLAGS) -o $@ $^ $(BIN_LIB) $(LDFLAGS) $(LIBS)
+       $(CXX) $(CXXFLAGS) -o $@ $^ $(BIN_LIB) $(LDFLAGS) $(LIBS)
 
 # copy python scripts in $(top_builddir)/bin/salome
 #
@@ -161,7 +161,7 @@ install: $(LIB) $(BIN) $(TEST_PROGS) $(libdir) $(includedir) $(bindir) $(datadir
 # Install exported includes in includedir
        @for f in X $(EXPORT_HEADERS:%=$(srcdir)/%); do                       \
           if test $$f != X; then                                             \
-            (cp -p $$f $(includedir) || exit 1);                             \
+            (cp -p -f $$f $(includedir) || exit 1);                          \
           fi;                                                                \
        done