[rkward-cvs] SF.net SVN: rkward:[3816] trunk/rkward/rkward

[tfry at users.sourceforge.net]

Revision: 3816
          http://rkward.svn.sourceforge.net/rkward/?rev=3816&view=rev
Author:   tfry
Date:     2011-09-22 09:48:49 +0000 (Thu, 22 Sep 2011)
Log Message:
-----------
Since rkwarddev and XiMpLe are now available from our repo, do not install them in make install.

Modified Paths:
--------------
    trunk/rkward/rkward/rbackend/rpackages/rpackage_install.cmake.in
    trunk/rkward/rkward/windows/rkhtmlwindow.cpp

Modified: trunk/rkward/rkward/rbackend/rpackages/rpackage_install.cmake.in
===================================================================
--- trunk/rkward/rkward/rbackend/rpackages/rpackage_install.cmake.in	2011-09-21 19:05:16 UTC (rev 3815)
+++ trunk/rkward/rkward/rbackend/rpackages/rpackage_install.cmake.in	2011-09-22 09:48:49 UTC (rev 3816)
@@ -11,7 +11,7 @@
 		FILE(MAKE_DIRECTORY "${R_LIBDIR}")
 	ENDIF(DESTDIR)
 	EXECUTE_PROCESS(
-		COMMAND @R_EXECUTABLE@ CMD INSTALL -c -l ${R_LIBDIR} "@CMAKE_CURRENT_SOURCE_DIR@/rkward" "@CMAKE_CURRENT_SOURCE_DIR@/rkwardtests" "@CMAKE_CURRENT_SOURCE_DIR@/XiMpLe" "@CMAKE_CURRENT_SOURCE_DIR@/rkwarddev"
+		COMMAND @R_EXECUTABLE@ CMD INSTALL -c -l ${R_LIBDIR} "@CMAKE_CURRENT_SOURCE_DIR@/rkward" "@CMAKE_CURRENT_SOURCE_DIR@/rkwardtests"
 		WORKING_DIRECTORY @CMAKE_CURRENT_BINARY_DIR@
 		RESULT_VARIABLE R_LIB_INSTALL_EXIT_CODE
 	)
@@ -20,7 +20,7 @@
 		COMMAND mkdir -p @CMAKE_CURRENT_BINARY_DIR@/tmp ${DESTDIR}/@R_LIBDIR@
 	)
 	EXECUTE_PROCESS(
-		COMMAND env TMPDIR=@CMAKE_CURRENT_BINARY_DIR@/tmp @R_EXECUTABLE@ CMD INSTALL -c -l ${DESTDIR}/@R_LIBDIR@ "@CMAKE_CURRENT_SOURCE_DIR@/rkward" "@CMAKE_CURRENT_SOURCE_DIR@/rkwardtests" "@CMAKE_CURRENT_SOURCE_DIR@/XiMpLe" "@CMAKE_CURRENT_SOURCE_DIR@/rkwarddev"
+		COMMAND env TMPDIR=@CMAKE_CURRENT_BINARY_DIR@/tmp @R_EXECUTABLE@ CMD INSTALL -c -l ${DESTDIR}/@R_LIBDIR@ "@CMAKE_CURRENT_SOURCE_DIR@/rkward" "@CMAKE_CURRENT_SOURCE_DIR@/rkwardtests"
 		WORKING_DIRECTORY @CMAKE_CURRENT_BINARY_DIR@
 		RESULT_VARIABLE R_LIB_INSTALL_EXIT_CODE
 	)

Modified: trunk/rkward/rkward/windows/rkhtmlwindow.cpp
===================================================================
--- trunk/rkward/rkward/windows/rkhtmlwindow.cpp	2011-09-21 19:05:16 UTC (rev 3815)
+++ trunk/rkward/rkward/windows/rkhtmlwindow.cpp	2011-09-22 09:48:49 UTC (rev 3816)
@@ -225,6 +225,7 @@
 void RKHTMLWindow::slotBack () {
 	RK_TRACE (APP);
 
+	// if going back from the end of the history, save that position, first.
 	if (current_history_position >= (url_history.count () - 1)) {
 		changeURL (khtmlpart->url ());
 		--current_history_position;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.