re PR target/52122 (incorrect ln -s replacement for mingw like targets in configure...

        PR target/52122
        * Makefile.in (LN_S_RECUSIVE): New.
        (adainclude, adalib): Use LN_S_RECURSIVE for copy.

From-SVN: r195982

diff --git a/libada/ChangeLog b/libada/ChangeLog
index 3ac329b20b6a4367861227d589b0be650dd56f0f..85ba3cd281cf464834845deda5fe65842a2a000b 100644 (file)
--- a/libada/ChangeLog
+++ b/libada/ChangeLog
@@ -1,3 +1,10 @@
+2013-02-12  Kai Tietz  <ktietz@redhat.com>
+
+       Back-merged from mainline.
+       PR target/52122
+       * Makefile.in (LN_S_RECUSIVE): New.
+       (adainclude, adalib): Use LN_S_RECURSIVE for copy.
+
 2012-03-01  Release Manager
 
        * GCC 4.6.3 released.

diff --git a/libada/Makefile.in b/libada/Makefile.in
index 2fa1c6a8c8f354f1d25ae7ef3de1346e940867c9..e6120a39c06d3d7e4ef6854ac5cd5a532ae7ad55 100644 (file)
--- a/libada/Makefile.in
+++ b/libada/Makefile.in
@@ -43,6 +43,12 @@ enable_shared = @enable_shared@
 LN_S=@LN_S@
 AWK=@AWK@
 
+ifeq (cp -p,$(LN_S))
+LN_S_RECURSIVE = cp -pR
+else
+LN_S_RECURSIVE = $(LN_S)
+endif
+
 # Variables for the user (or the top level) to override.
 objext=.o
 GNATLIBFLAGS= -W -Wall -gnatpg
@@ -106,8 +112,8 @@ gnatlib-plain: osconstool $(GCC_DIR)/ada/Makefile
        && touch stamp-libada
        -rm -rf adainclude
        -rm -rf adalib
-       $(LN_S) $(ADA_RTS_DIR) adainclude
-       $(LN_S) $(ADA_RTS_DIR) adalib
+       $(LN_S_RECURSIVE) $(ADA_RTS_DIR) adainclude
+       $(LN_S_RECURSIVE) $(ADA_RTS_DIR) adalib
 
 gnatlib-sjlj gnatlib-zcx gnatlib-shared: osconstool $(GCC_DIR)/ada/Makefile
        test -f stamp-libada || \
@@ -115,8 +121,8 @@ gnatlib-sjlj gnatlib-zcx gnatlib-shared: osconstool $(GCC_DIR)/ada/Makefile
        && touch stamp-libada
        -rm -rf adainclude
        -rm -rf adalib
-       $(LN_S) $(ADA_RTS_DIR) adainclude
-       $(LN_S) $(ADA_RTS_DIR) adalib
+       $(LN_S_RECUSIVE) $(ADA_RTS_DIR) adainclude
+       $(LN_S_RECUSIVE) $(ADA_RTS_DIR) adalib
 
 osconstool:
        $(MAKE) -C $(GCC_DIR)/ada $(LIBADA_FLAGS_TO_PASS) ./bldtools/oscons/xoscons