Skip to content
Browse files

new fixes for the R framework installation: patches to the SHLIB scri…

…pt and R

git-svn-id: https://svn.r-project.org/R/trunk@28457 00db46b3-68df-0310-9c12-caf00c1e9a41
  • Loading branch information...
1 parent 5e3c9b3 commit c6140253ed95701611b9afca648edae5ed381b64 iacus committed Feb 29, 2004
Showing with 18 additions and 1 deletion.
  1. +18 −1 Makefile.in
View
19 Makefile.in
@@ -85,7 +85,19 @@ install: installdirs
done
@WANT_R_FRAMEWORK_TRUE@ $(MAKE) install-R-framework
@WANT_R_FRAMEWORK_TRUE@ @(sed 's/^LIBR =.*/LIBR = -framework R/' \
-@WANT_R_FRAMEWORK_TRUE@ $(top_builddir)/etc/Makeconf > $(rhome)/etc/Makeconf)
+@WANT_R_FRAMEWORK_TRUE@ $(top_builddir)/etc/Makeconf > $(rhome)/etc/Makeconf)
+@WANT_R_FRAMEWORK_TRUE@ @(sed 's/Versions\/$(VERSION)\/Resources/Resources/' \
+@WANT_R_FRAMEWORK_TRUE@ $(R_FRAMEWORK_DIR)/Resources/bin/R > \
+@WANT_R_FRAMEWORK_TRUE@ $(R_FRAMEWORK_DIR)/Resources/bin/RR)
+@WANT_R_FRAMEWORK_TRUE@ @(mv $(R_FRAMEWORK_DIR)/Resources/bin/RR $(R_FRAMEWORK_DIR)/Resources/bin/R)
+@WANT_R_FRAMEWORK_TRUE@ @(chmod 755 $(R_FRAMEWORK_DIR)/Resources/bin/R)
+@WANT_R_FRAMEWORK_TRUE@ @(sed 's/-L$$[{]R\_HOME[}]\/bin -lR/-framework R/' \
+@WANT_R_FRAMEWORK_TRUE@ $(R_FRAMEWORK_DIR)/Resources/bin/SHLIB > \
+@WANT_R_FRAMEWORK_TRUE@ $(R_FRAMEWORK_DIR)/Resources/bin/SSHLIB)
+@WANT_R_FRAMEWORK_TRUE@ @(mv $(R_FRAMEWORK_DIR)/Resources/bin/SSHLIB $(R_FRAMEWORK_DIR)/Resources/bin/SHLIB)
+@WANT_R_FRAMEWORK_TRUE@ @(chmod 755 $(R_FRAMEWORK_DIR)/Resources/bin/SHLIB)
+
+
installdirs:
@$(MKINSTALLDIRS) $(rhome)
install-strip:
@@ -182,6 +194,11 @@ install-R-framework:
sed 's/^args=/args=--gui=aqua/' < R > RAqua && \
chmod 755 RAqua && \
install_name_tool -id "$(R_FRAMEWORK_DIR)/Versions/$(VERSION)/Resources/bin/libR.dylib" libR.dylib)
+ @(sed 's/Versions\/$(VERSION)\/Resources/Resources/' $(R_FRAMEWORK_DIR)/Resources/bin/RAqua > \
+ $(R_FRAMEWORK_DIR)/Resources/bin/RRAqua)
+ @(mv $(R_FRAMEWORK_DIR)/Resources/bin/RRAqua $(R_FRAMEWORK_DIR)/Resources/bin/RAqua)
+ @(chmod 755 $(R_FRAMEWORK_DIR)/Resources/bin/RAqua)
+
install-aqua:
@(rm -rf /Applications/R.app)

0 comments on commit c614025

Please sign in to comment.
Something went wrong with that request. Please try again.