Index: openacs-4/packages/acs-bootstrap-installer/tcl/00-proc-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-bootstrap-installer/tcl/00-proc-procs.tcl,v
diff -u -r1.41.2.9 -r1.41.2.10
--- openacs-4/packages/acs-bootstrap-installer/tcl/00-proc-procs.tcl	13 Oct 2013 10:22:22 -0000	1.41.2.9
+++ openacs-4/packages/acs-bootstrap-installer/tcl/00-proc-procs.tcl	16 Oct 2013 19:37:01 -0000	1.41.2.10
@@ -29,19 +29,19 @@
 }
 
 proc acs_root_dir {} {
-    return [nsv_get acs_properties root_directory]
+    return $::acs::rootdir
 }
 
 proc acs_package_root_dir { package } {
-    return "[file join [acs_root_dir] packages $package]"
+    return [file join $::acs::rootdir packages $package]
 }
 
 proc ad_make_relative_path { path } {
-    set root_length [string length [acs_root_dir]]
-    if { [acs_root_dir] eq [string range $path 0 $root_length-1] } {
+    set root_length [string length $::acs::rootdir]
+    if { $::acs::rootdir eq [string range $path 0 $root_length-1] } {
 	return [string range $path $root_length+1 [string length $path]]
     }
-    error "$path is not under the path root ([acs_root_dir])"
+    error "$path is not under the path root ($::acs::rootdir)"
 }
 
 proc ad_get_tcl_call_stack { { level -2 }} {
@@ -400,10 +400,9 @@
         set doc_elements($element) [array get $element]
     }
     
-    set root_dir [nsv_get acs_properties root_directory]
     set script [info script]
-    set root_length [string length $root_dir]
-    if { $root_dir eq [string range $script 0 $root_length-1] } {
+    set root_length [string length $::acs::rootdir]
+    if { $::acs::rootdir eq [string range $script 0 $root_length-1] } {
         set script [string range $script $root_length+1 end]
     }
     
Index: openacs-4/packages/acs-bootstrap-installer/tcl/30-apm-load-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-bootstrap-installer/tcl/30-apm-load-procs.tcl,v
diff -u -r1.41.2.5 -r1.41.2.6
--- openacs-4/packages/acs-bootstrap-installer/tcl/30-apm-load-procs.tcl	2 Oct 2013 08:56:26 -0000	1.41.2.5
+++ openacs-4/packages/acs-bootstrap-installer/tcl/30-apm-load-procs.tcl	16 Oct 2013 19:37:01 -0000	1.41.2.6
@@ -461,7 +461,6 @@
 
     # Load up queries.
 
-    set root_directory [nsv_get acs_properties root_directory]
     set db_type [nsv_get ad_database_type .]
 
     # DRB: We can't parse the $package_key.info file at this point in time, primarily because
@@ -470,9 +469,9 @@
 	# queryfiles in this package that match the current database or no database
     # (which we interpret to mean all supported databases).
 
-    set files [ad_find_all_files $root_directory/packages/$package_key]
+    set files [ad_find_all_files $::acs::rootdir/packages/$package_key]
     if { [llength $files] == 0 } {
-	error "Unable to locate $root_directory/packages/$package_key/*."
+	error "Unable to locate $::acs::rootdir/packages/$package_key/*."
     }
 
     foreach file [lsort $files] {
@@ -510,7 +509,7 @@
 
     @author Peter Marklund
 } {
-    return "[acs_root_dir]/install.xml"
+    return "$::acs::rootdir/install.xml"
 }
 
 ad_proc -private apm_ignore_file_p {