Skip to content

Commit ec57217

Browse files
author
urbaneks
committed
fix install for R framework to support DESTDIR correctly
git-svn-id: https://svn.r-project.org/R/trunk@80503 00db46b3-68df-0310-9c12-caf00c1e9a41
1 parent f6d93f0 commit ec57217

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

Makefile.fw

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ include $(top_builddir)/Makeconf
88

99
install install-strip: install-R-framework
1010
@(sed 's|^LIBR =.*|LIBR = -F$(R_FRAMEWORK_DIR)/.. -framework R|' \
11-
$(top_builddir)/etc/Makeconf > "$(rhome)/etc${R_ARCH}/Makeconf")
11+
$(top_builddir)/etc/Makeconf > "$(DESTDIR)$(R_FRAMEWORK_DIR)/Resources/etc${R_ARCH}/Makeconf")
1212
@(sed 's/Versions\/$(FW_VERSION)\/Resources/Resources/' \
1313
"$(DESTDIR)$(R_FRAMEWORK_DIR)/Resources/bin/R" > \
1414
"$(DESTDIR)$(R_FRAMEWORK_DIR)/Resources/bin/RR")
@@ -37,7 +37,7 @@ install-R-framework:
3737
ln -f -s -n Versions/Current/Resources Resources)
3838
@## the resulting libR will point dyld to the fat libR regardless of its origin
3939
@(cd "$(DESTDIR)$(R_FRAMEWORK_DIR)/Resources/lib" && \
40-
install_name_tool -id "$(R_FRAMEWORK_DIR)/Versions/$(FW_VERSION)/Resources/lib/libR.dylib" $(Rexeclibdir)/libR.dylib)
40+
install_name_tool -id "$(R_FRAMEWORK_DIR)/Versions/$(FW_VERSION)/Resources/lib/libR.dylib" "$(DESTDIR)$(Rexeclibdir)/libR.dylib")
4141
@( otool=otool ; if otool -D "$(DESTDIR)$(Rexeclibdir)/libR.dylib"|grep 'not an object'>/dev/null; then otool=otool64; fi; \
4242
for lib in Rlapack Rblas R; do \
4343
if test -e "$(DESTDIR)$(Rexeclibdir)/lib$${lib}.dylib"; then $(ECHO) " lib$${lib}"; \

0 commit comments

Comments
 (0)