Permalink
Browse files

make sure Resources is a symlink in the framework

git-svn-id: https://svn.r-project.org/R/trunk@50627 00db46b3-68df-0310-9c12-caf00c1e9a41
  • Loading branch information...
1 parent 49dd1df commit 890d70265f35800d59bb4607e831bf3f80c11c95 urbaneks committed Dec 1, 2009
Showing with 9 additions and 0 deletions.
  1. +3 −0 Makefile.fw
  2. +6 −0 NEWS
View
@@ -26,6 +26,9 @@ install-R-framework:
mkdir "$(R_FRAMEWORK_DIR)/Versions/$(FW_VERSION)/PrivateHeaders"; fi
@(cd "$(R_FRAMEWORK_DIR)/Versions" && \
ln -f -s -n $(FW_VERSION) Current)
+ @(if [ -e "$(R_FRAMEWORK_DIR)/Resources" -a ! -L "$(R_FRAMEWORK_DIR)/Resources" ]; then \
+ rm -rf "$(R_FRAMEWORK_DIR)/Resources.old"; mv "$(R_FRAMEWORK_DIR)/Resources" "$(R_FRAMEWORK_DIR)/Resources.old"; \
+ fi)
@(cd "$(R_FRAMEWORK_DIR)" && \
ln -f -s -n Versions/Current/PrivateHeaders PrivateHeaders&& \
ln -f -s -n Versions/Current/Headers Headers&& \
View
6 NEWS
@@ -167,6 +167,12 @@ BUG FIXES
could cause an infinite recursion. An internal switch was
added to turn off all such methods from findInheritedMethods.
+ o R framework installation would not work properly if a rogue
+ Resources directory is present at the top level. Such
+ non-symlink will now be renamed to Resources.old (and
+ anything previously named Resources.old removed) as part of
+ the framework installation process.
+
**************************************************

0 comments on commit 890d702

Please sign in to comment.