From ch-r at bobobeach.com  Thu May 13 20:56:05 2004
From: ch-r at bobobeach.com (ch-r@bobobeach.com)
Date: Thu May 13 20:56:10 2004
Subject: [Rd] Darwin Framework and Application Install Directory
	Improvements (PR#6882)
Message-ID: <20040513185605.B98C110537@slim.kubism.ku.dk>

Full_Name: Cyrus Harmon
Version: 1.9.0
OS: MacOS X 10.3
Submission from: (NULL) (169.229.10.50)


R_FRAMEWORK_DIR should default to $(prefix)/Libraries/R.framework and there
should be a new directory to put R.app in like $(prefix)/Applications. The
following patch does this:

===================================================================
RCS file: Makeconf.in,v
retrieving revision 1.1
diff -r1.1 Makeconf.in
63c63,64
< R_FRAMEWORK_DIR = $(prefix)/R.framework
---
> R_FRAMEWORK_DIR = $(prefix)/Libraries/R.framework
> R_APPLICATION_DIR = $(prefix)/Applications/

===================================================================
RCS file: Makefile.in,v
retrieving revision 1.1
diff -r1.1 Makefile.in
204,205c204,205
<       @(rm -rf /Applications/R.app)
<       @(mkdir -p /Applications/R.app/Contents/Resources)
---
>       @(rm -rf $(R_APPLICATION_DIR)/R.app)
>       @(mkdir -p $(R_APPLICATION_DIR)/R.app/Contents/Resources)
207c207
<         cp PkgInfo /Applications/R.app/Contents)
---
>         cp PkgInfo $(R_APPLICATION_DIR)/R.app/Contents)
209c209
<         cp Info.plist  /Applications/R.app/Contents)
---
>         cp Info.plist  $(R_APPLICATION_DIR)/R.app/Contents)
211,212c211,212
<         cp -R * /Applications/R.app/Contents/Resources)
<       @(mkdir -p /Applications/R.app/Contents/MacOS)
---
>         cp -R * $(R_APPLICATION_DIR)/R.app/Contents/Resources)
>       @(mkdir -p $(R_APPLICATION_DIR)/R.app/Contents/MacOS)
215c215
<       @(cd /Applications/R.app/Contents/MacOS && \
---
>       @(cd $(R_APPLICATION_DIR)/R.app/Contents/MacOS && \


[Rd] Darwin Framework and Application Install Directory Improvements (PR#6882)
ch-r@bobobeach.com