[rkward-cvs] rkward/rkward Makefile.am,1.63,1.64 makerkwardscript.pl,1.1,1.2 rkward.sh.template,1.1,1.2

[Thomas Friedrichsmeier]

Update of /cvsroot/rkward/rkward/rkward
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25052/rkward

Modified Files:
	Makefile.am makerkwardscript.pl rkward.sh.template 
Log Message:
Autodetection of R_HOME, R_SHARE_DIR, etc. during configure. Should fix compilation/run-time issues with recent debian versions of R

Index: rkward.sh.template
===================================================================
RCS file: /cvsroot/rkward/rkward/rkward/rkward.sh.template,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** rkward.sh.template	10 Nov 2005 22:38:16 -0000	1.1
--- rkward.sh.template	21 Feb 2006 13:26:19 -0000	1.2
***************
*** 9,17 ****
  R_HOME="${R_HOME_DIR}"
  export R_HOME
! R_SHARE_DIR="${R_HOME_DIR}/share"
  export R_SHARE_DIR
! R_INCLUDE_DIR="${R_HOME_DIR}/include"
  export R_INCLUDE_DIR
! R_DOC_DIR="${R_HOME_DIR}/doc"
  export R_DOC_DIR
  
--- 9,17 ----
  R_HOME="${R_HOME_DIR}"
  export R_HOME
! R_SHARE_DIR=###R_SHARE_DIR###
  export R_SHARE_DIR
! R_INCLUDE_DIR=###R_INCLUDE_DIR###
  export R_INCLUDE_DIR
! R_DOC_DIR=###R_DOC_DIR###
  export R_DOC_DIR
  

Index: makerkwardscript.pl
===================================================================
RCS file: /cvsroot/rkward/rkward/rkward/makerkwardscript.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** makerkwardscript.pl	10 Nov 2005 22:38:16 -0000	1.1
--- makerkwardscript.pl	21 Feb 2006 13:26:18 -0000	1.2
***************
*** 3,6 ****
--- 3,9 ----
  $template = $ARGV[0];
  $r_home = "\"$ARGV[1]\"";
+ $r_includes = "\"$ARGV[2]\"";
+ $r_share = "\"$ARGV[3]\"";
+ $r_doc = "\"$ARGV[4]\"";
  
  open (TEMPLATE, "< $template") or die "Can't open template";
***************
*** 8,11 ****
--- 11,17 ----
  	$line = $_;
  	$line =~ s/###R_HOME_DIR###/$r_home/;
+ 	$line =~ s/###R_INCLUDE_DIR###/$r_includes/;
+ 	$line =~ s/###R_SHARE_DIR###/$r_share/;
+ 	$line =~ s/###R_DOC_DIR###/$r_doc/;
  	print ($line);
  }

Index: Makefile.am
===================================================================
RCS file: /cvsroot/rkward/rkward/rkward/Makefile.am,v
retrieving revision 1.63
retrieving revision 1.64
diff -C2 -d -r1.63 -r1.64
*** Makefile.am	13 Nov 2005 13:16:09 -0000	1.63
--- Makefile.am	21 Feb 2006 13:26:18 -0000	1.64
***************
*** 63,69 ****
  bin_SCRIPTS = rkward
  
! # all the perl script does is fill in the placeholder for R_HOMEDIR
  rkward:
! 	perl ./makerkwardscript.pl rkward.sh.template "$(R_HOMEDIR)" > rkward; \
  	chmod 744 rkward
  
--- 63,69 ----
  bin_SCRIPTS = rkward
  
! # all the perl script does is fill in the placeholder for R_HOMEDIR and friends
  rkward:
! 	perl ./makerkwardscript.pl rkward.sh.template "$(R_HOMEDIR)" "$(R_INCLUDEDIR)" "$(R_SHAREDIR)" "$(R_DOCDIR)" > rkward; \
  	chmod 744 rkward