Port of r40975/40976 from trunk

git-svn-id: https://svn.r-project.org/R/branches/R-2-4-branch@40978 00db46b3-68df-0310-9c12-caf00c1e9a41
wch · Mar 30, 2007 · c38e08b · c38e08b
1 parent 5ad4530
commit c38e08b
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/src/gnuwin32/CHANGES b/src/gnuwin32/CHANGES
@@ -129,6 +129,8 @@ It is possible to select (in MkRules) the type of debug symbol used,
 and this now defaults to 'dwarf-2' (which is more efficient than the
 previous default of 'stabs').  More parts of R are now built with debug
 symbols when DEBUG=T.
+
+etc/Makeconf was being left out of builds of the installer.
 
 The symbols in graphapp are now remapped to start with GA_, so any
 code making use of graphapp will need to be recompiled.

diff --git a/src/gnuwin32/installer/JRins.pl b/src/gnuwin32/installer/JRins.pl
@@ -336,7 +336,8 @@ END
 		"bin\\Rd2txt" => 1,
 		"bin\\Rdconv" => 1,
 		"bin\\Rdiff.sh" => 1,
-		"bin\\Sd2Rd" => 1);
+		"bin\\Sd2Rd" => 1,
+		"etc\\Makeconf" => 1);
 
 $path="${SRCDIR}";chdir($path);
 find(\&listFiles, ".");

diff --git a/src/gnuwin32/installer/Makefile b/src/gnuwin32/installer/Makefile
@@ -24,7 +24,7 @@ INFO_FILES = COPYING NEWS README
 DOC_INFO_FILES = AUTHORS COPYING COPYING.LIB FAQ RESOURCES THANKS
 GW_INFO_FILES = CHANGES COPYRIGHTS README.Rterm rw-FAQ
 
-ETC_FILES = Rprofile.site Rconsole Rdevga rgb.txt repositories
+ETC_FILES = Rprofile.site Rconsole Rdevga rgb.txt repositories Makeconf
 
 GW32_FILES = MkRules MakePkg MakeDll Rpwd.exe pwd.pl makeDllRes.pl install-save.sh