Fix for PR bootstrap/59094 +2014-01-09 Balaji V.

Fix for PR bootstrap/59094
+2014-01-09  Balaji V. Iyer  <balaji.v.iyer@intel.com>
+
+       PR bootstrap/59094
+       * Makefile.am (cilkincludedir): Fixed a bug to store version-specific
+       runtime libraries in the correct place.
+       * Makefile.in: Regenerate.
+

From-SVN: r206469

diff --git a/libcilkrts/ChangeLog b/libcilkrts/ChangeLog
index 74f592b9fc5e82d2599aea3d2aec5486953c0fb8..5ac0e4863db78fc01dc31804f634fc2e78b9688d 100644 (file)
--- a/libcilkrts/ChangeLog
+++ b/libcilkrts/ChangeLog
@@ -1,3 +1,10 @@
+2014-01-09  Balaji V. Iyer  <balaji.v.iyer@intel.com>
+
+       bootstrap/59094
+       * Makefile.am (cilkincludedir): Fixed a bug to store version-specific
+       runtime libraries in the correct place.
+       * Makefile.in: Regenerate.
+
 2013-12-13  Balaji V. Iyer  <balaji.v.iyer@intel.com>
 
        * Makefile.am (GENERAL_FLAGS): Removed undefining of Cilk keywords.

diff --git a/libcilkrts/Makefile.am b/libcilkrts/Makefile.am
index d2520870a7e6cb4c6deb80242ac6645cf9f4de30..f2d13aabd88308796addd44d25ccdf3bd6cc02cf 100644 (file)
--- a/libcilkrts/Makefile.am
+++ b/libcilkrts/Makefile.am
@@ -108,7 +108,8 @@ endif
 libcilkrts_la_LDFLAGS += -no-undefined
 
 # C/C++ header files for Cilk.
-cilkincludedir = $(includedir)/cilk
+# cilkincludedir = $(includedir)/cilk
+cilkincludedir = $(libdir)/gcc/$(target_alias)/$(gcc_version)/include/cilk
 cilkinclude_HEADERS =              \
   include/cilk/cilk_api.h          \
   include/cilk/cilk_api_linux.h    \

diff --git a/libcilkrts/Makefile.in b/libcilkrts/Makefile.in
index 94902e1336e0cea8c07eeb3cfc83726ed2cfdb0b..092e2f706ec413a836c6bdd9b2b38fd8e96107c3 100644 (file)
--- a/libcilkrts/Makefile.in
+++ b/libcilkrts/Makefile.in
@@ -401,7 +401,8 @@ libcilkrts_la_LDFLAGS = -version-info 5:0:0 -lpthread \
        -no-undefined
 
 # C/C++ header files for Cilk.
-cilkincludedir = $(includedir)/cilk
+# cilkincludedir = $(includedir)/cilk
+cilkincludedir = $(libdir)/gcc/$(target_alias)/$(gcc_version)/include/cilk
 cilkinclude_HEADERS = \
   include/cilk/cilk_api.h          \
   include/cilk/cilk_api_linux.h    \