NRI : Merge from V1_2.

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

diff --git a/salome_adm/unix/make_conclude.in b/salome_adm/unix/make_conclude.in
index 75773a0d982dfe046f3407ee4a066f1fc115a2c4..fe43d0e54706985d1855324cc2066f0be1f4c2ec 100644 (file)
--- a/salome_adm/unix/make_conclude.in
+++ b/salome_adm/unix/make_conclude.in
@@ -52,19 +52,19 @@ $(LIB_BUILD): $(top_builddir)/lib/salome/%.la: %.la
        -$(RM) $@
        -$(RM) $(patsubst %.la, %.so, $@)
        -$(RM) $(patsubst %.la, %.a, $@)
-       ln -s $(CURDIR)/$< $@ || true
-       ln -s $(patsubst %.la, %.so, $(CURDIR)/.libs/$<) \
+       ln -sf $(CURDIR)/$< $@ || true
+       ln -sf $(patsubst %.la, %.so, $(CURDIR)/.libs/$<) \
              $(patsubst %.la, %.so, $@) || true
-       ln -s $(patsubst %.la, %.so, $(CURDIR)/.libs/$<).0 \
+       ln -sf $(patsubst %.la, %.so, $(CURDIR)/.libs/$<).0 \
              $(patsubst %.la, %.so, $@).0 || true
 
        if ! test -z $(LIB_SWIG) ; then \
-          ln -s $(patsubst %.la,%.so, $(CURDIR)/.libs/$<) $(top_builddir)/lib/salome/_$(LIB_SWIG) || true;\
+          ln -sf $(patsubst %.la,%.so, $(CURDIR)/.libs/$<) $(top_builddir)/lib/salome/_$(LIB_SWIG) || true;\
        fi;
 
 $(LIB_BUILD_A): $(top_builddir)/lib/salome/%.a: %.a
        -$(RM) $@
-       ln -s $(CURDIR)/$< $@ || true
+       ln -sf $(CURDIR)/$< $@ || true
 
 $(LIB): $(LIB_OBJ)
        @$(LT) --mode=link $(CXX) -rpath $(libdir) -o $@ $(CXXFLAGS) $(LIB_OBJ) $(LDFLAGS) $(LIBS)
@@ -92,7 +92,7 @@ BIN_LIB=$(LIB:lib%.la=-l%)
 
 $(BIN:%=$(top_builddir)/bin/salome/%) $(TEST_PROGS:%=$(top_builddir)/bin/salome/%): $(top_builddir)/bin/salome/%: %
        -$(RM) $@
-       ln -s $(CURDIR)/$< $@
+       ln -sf $(CURDIR)/$< $@
 
 $(BIN) $(TEST_PROGS): %: %.lo $(BIN_OBJ)
        $(CXX) $(CXXFLAGS) -o $@ $^ $(BIN_LIB) $(LDFLAGS) $(LIBS)
@@ -145,7 +145,7 @@ install: $(LIB) $(BIN) $(TEST_PROGS) $(libdir) $(includedir) $(bindir) $(datadir
           fi;                                                                \
        done
        @if ! test -z $(LIB_SWIG) ; then                                      \
-         (cd $(libdir); ln -s $(patsubst %.so, %cmodule.so, $(LIB_SWIG)) _$(LIB_SWIG)  || true); \
+         (cd $(libdir); ln -sf $(patsubst %.so, %cmodule.so, $(LIB_SWIG)) _$(LIB_SWIG)  || true); \
         fi;                                                                  
        @for f in X $(BIN); do                                                \
           if test $$f != X; then                                             \