Index: openacs-4/packages/acs-authentication/tcl/authority-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-authentication/tcl/authority-procs.tcl,v
diff -u -N -r1.28.8.2 -r1.28.8.3
--- openacs-4/packages/acs-authentication/tcl/authority-procs.tcl	2 Oct 2013 08:01:35 -0000	1.28.8.2
+++ openacs-4/packages/acs-authentication/tcl/authority-procs.tcl	17 Oct 2013 08:51:56 -0000	1.28.8.3
@@ -361,7 +361,7 @@
                 if { $ack_file_name ne "" } {
                     # Interpolate
                     set pairs [list \
-                                   acs_root_dir [acs_root_dir] \
+                                   acs_root_dir $::acs::rootdir \
                                    ansi_date [clock format [clock seconds] -format %Y-%m-%d] \
                                    authority $authority(short_name)]
                     foreach { var value } $pairs {
Index: openacs-4/packages/acs-authentication/tcl/test/sync-test-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-authentication/tcl/test/sync-test-procs.tcl,v
diff -u -N -r1.19.10.1 -r1.19.10.2
--- openacs-4/packages/acs-authentication/tcl/test/sync-test-procs.tcl	30 Sep 2013 18:26:48 -0000	1.19.10.1
+++ openacs-4/packages/acs-authentication/tcl/test/sync-test-procs.tcl	17 Oct 2013 08:51:56 -0000	1.19.10.2
@@ -965,7 +965,7 @@
 aa_register_case -cats {api web} sync_file_get_document {
     Test the HTTPGet implementation of GetDocument service contract.
 } {
-    set path "[acs_root_dir]/www/SYSTEM/dbtest.tcl"
+    set path "$::acs::rootdir/www/SYSTEM/dbtest.tcl"
 
     aa_log "Getting path '$path'"
 
Index: openacs-4/packages/acs-automated-testing/tcl/aa-test-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-automated-testing/tcl/aa-test-procs.tcl,v
diff -u -N -r1.38.6.2 -r1.38.6.3
--- openacs-4/packages/acs-automated-testing/tcl/aa-test-procs.tcl	13 Oct 2013 10:18:25 -0000	1.38.6.2
+++ openacs-4/packages/acs-automated-testing/tcl/aa-test-procs.tcl	17 Oct 2013 08:54:59 -0000	1.38.6.3
@@ -144,7 +144,7 @@
     #
     # Work out the package key
     #
-    set package_root [file join [acs_root_dir] packages]
+    set package_root [file join $::acs::rootdir packages]
     set package_rel [string replace [info script] \
                          0 [string length $package_root]]
     if {![info exists package_key]} {
@@ -215,7 +215,7 @@
     #
     # Work out the package key
     #
-    set package_root [file join [acs_root_dir] packages]
+    set package_root [file join $::acs::rootdir packages]
     set package_rel [string replace [info script] \
                          0 [string length $package_root]]
     set package_key [lindex [file split $package_rel] 0]
@@ -355,7 +355,7 @@
     #
     # Work out the package_key.
     #
-    set package_root [file join [acs_root_dir] packages]
+    set package_root [file join $::acs::rootdir packages]
     set package_rel [string replace [info script] \
                          0 [string length $package_root]]
     set package_key [lindex [file split $package_rel] 0]
Index: openacs-4/packages/acs-bootstrap-installer/installer.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-bootstrap-installer/installer.tcl,v
diff -u -N -r1.24.2.2 -r1.24.2.3
--- openacs-4/packages/acs-bootstrap-installer/installer.tcl	2 Oct 2013 08:29:06 -0000	1.24.2.2
+++ openacs-4/packages/acs-bootstrap-installer/installer.tcl	17 Oct 2013 08:54:59 -0000	1.24.2.3
@@ -244,15 +244,15 @@
 	set doc_urlv [split [string trimleft $doc_url] /]
 	set package_key [lindex $doc_urlv 1]
 	ns_log Debug "Scanning $doc_url with package_key $package_key..."
-	if {[file isfile "[acs_root_dir]/packages/acs-core-docs/www[join $doc_urlv /]"]} {
-	    install_file_serve "[acs_root_dir]/packages/acs-core-docs/www[join $doc_urlv /]"
+	if {[file isfile "$::acs::rootdir/packages/acs-core-docs/www[join $doc_urlv /]"]} {
+	    install_file_serve "$::acs::rootdir/packages/acs-core-docs/www[join $doc_urlv /]"
 	} elseif {[file isdirectory \
-		"[acs_root_dir]/packages/acs-core-docs/www[join $doc_urlv /]"]} {
-	    install_file_serve "[acs_root_dir]/packages/acs-core-docs/www[join $doc_urlv /]"
-	} elseif {[file isdirectory "[acs_root_dir]/packages/$package_key/www/doc"]} {
-	    install_file_serve "[acs_root_dir]/packages/$package_key/www/doc[join [lrange $doc_urlv 2 end] /]"
+		"$::acs::rootdir/packages/acs-core-docs/www[join $doc_urlv /]"]} {
+	    install_file_serve "$::acs::rootdir/packages/acs-core-docs/www[join $doc_urlv /]"
+	} elseif {[file isdirectory "$::acs::rootdir/packages/$package_key/www/doc"]} {
+	    install_file_serve "$::acs::rootdir/packages/$package_key/www/doc[join [lrange $doc_urlv 2 end] /]"
 	} else {
-	    install_file_serve "[acs_root_dir]/packages/$package_key/doc[join $doc_url /]"
+	    install_file_serve "$::acs::rootdir/packages/$package_key/doc[join $doc_url /]"
 	}
 	return "filter_return"
     }
@@ -266,7 +266,7 @@
 	]} {
 	    set system_file "$system_file.tcl"
 	}
-	apm_source "[acs_root_dir]/www/SYSTEM/$system_file"
+	apm_source "$::acs::rootdir/www/SYSTEM/$system_file"
 	return "filter_return"
     }
 
@@ -353,7 +353,7 @@
     Installing the OpenACS kernel data model...
     <blockquote><pre>
     "
-    cd [file join [acs_root_dir] packages acs-kernel sql [db_type]]
+    cd [file join $::acs::rootdir packages acs-kernel sql [db_type]]
     db_source_sql_file -callback apm_ns_write_callback acs-kernel-create.sql
 
     # DRB: Now initialize the APM's table of known database types.  This is
@@ -391,12 +391,12 @@
     apm_source "[acs_package_root_dir acs-tcl]/tcl/20-memoize-init.tcl"
     apm_source [acs_package_root_dir acs-tcl]/tcl/database-init.tcl
 
-    apm_version_enable -callback apm_ns_write_callback [apm_package_install -callback apm_ns_write_callback "[file join [acs_root_dir] packages acs-kernel acs-kernel.info]"]
+    apm_version_enable -callback apm_ns_write_callback [apm_package_install -callback apm_ns_write_callback "[file join $::acs::rootdir packages acs-kernel acs-kernel.info]"]
 
     ns_write "<p>Loading package .info files.<p>"
 
     # Preload all the .info files so the next page is snappy.
-    apm_dependency_check -initial_install [apm_scan_packages -new [file join [acs_root_dir] packages]]
+    apm_dependency_check -initial_install [apm_scan_packages -new [file join $::acs::rootdir packages]]
 
     ns_write "Done loading package .info files<p>"    
 }
@@ -434,7 +434,7 @@
     install_redefine_ad_conn
 
     # Attempt to install all packages.
-    set dependency_results [apm_dependency_check -initial_install [apm_scan_packages -new [file join [acs_root_dir] packages]]]
+    set dependency_results [apm_dependency_check -initial_install [apm_scan_packages -new [file join $::acs::rootdir packages]]]
     set dependencies_satisfied_p [lindex $dependency_results 0]
     set pkg_list [lindex $dependency_results 1]
 
@@ -452,7 +452,7 @@
         <blockquote><pre>"
 
         # Mount the main site
-        cd [file join [acs_root_dir] packages acs-kernel sql [db_type]]
+        cd [file join $::acs::rootdir packages acs-kernel sql [db_type]]
         db_source_sql_file -callback apm_ns_write_callback acs-install.sql
 
         # Make sure the site-node cache is updated with the main site
Index: openacs-4/packages/acs-bootstrap-installer/site-failure-message.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-bootstrap-installer/site-failure-message.tcl,v
diff -u -N -r1.1 -r1.1.22.1
--- openacs-4/packages/acs-bootstrap-installer/site-failure-message.tcl	24 Sep 2003 22:22:37 -0000	1.1
+++ openacs-4/packages/acs-bootstrap-installer/site-failure-message.tcl	17 Oct 2013 08:54:59 -0000	1.1.22.1
@@ -4,7 +4,7 @@
 
 proc site_failure_handler { conn arg why } {
 
-    ns_returnfile 500 text/html "[acs_root_dir]/www/global/site-failure.html"
+    ns_returnfile 500 text/html "$::acs::rootdir/www/global/site-failure.html"
     return "filter_return"
 }
 
Index: openacs-4/packages/acs-bootstrap-installer/installer/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-bootstrap-installer/installer/index.tcl,v
diff -u -N -r1.28.2.1 -r1.28.2.2
--- openacs-4/packages/acs-bootstrap-installer/installer/index.tcl	23 Sep 2013 18:08:33 -0000	1.28.2.1
+++ openacs-4/packages/acs-bootstrap-installer/installer/index.tcl	17 Oct 2013 08:54:59 -0000	1.28.2.2
@@ -190,30 +190,30 @@
 
 # APM needs to check its permissions.
 if { [catch {apm_workspace_dir} ] } {
-    append errors "<li><p><strong>The [acs_root_dir] directory has incorrect permissions.  It must be owned by
+    append errors "<li><p><strong>The $::acs::rootdir directory has incorrect permissions.  It must be owned by
 the user executing the web server, normally <code>nsadmin</code>, and the owner must have read and write privileges
 on this directory.  You can correct this by running the following script as root.
 To give another user access to the files, add them to <code>web</code> group.
 <blockquote><pre>
 groupadd web
-chown -R nsadmin:web [acs_root_dir]
-chmod -R ug+rw [acs_root_dir]
+chown -R nsadmin:web $::acs::rootdir
+chmod -R ug+rw $::acs::rootdir
 </pre></blockquote>
 </strong></p>"
     set error_p 1
 }
 
 # We have the workspace dir, but what about the package root?
-if { ![file writable [file join [acs_root_dir] packages]] } {
-    append errors "<li><p><strong>The [acs_root_dir]/packages directory has incorrect permissions.  It must be owned by
+if { ![file writable [file join $::acs::rootdir packages]] } {
+    append errors "<li><p><strong>The $::acs::rootdir/packages directory has incorrect permissions.  It must be owned by
     the user executing the web server, normally <code>nsadmin</code> and the owner must have read and write 
     privileges on this directory and all of its subdirectories.  You can correct this by running the following 
     script as root.
     To give another user access to the files, add them to <code>web</code> group.
     <blockquote><pre>
 groupadd web
-chown -R nsadmin:web [acs_root_dir]/packages
-chmod -R ug+rw [acs_root_dir]/packages
+chown -R nsadmin:web $::acs::rootdir/packages
+chmod -R ug+rw $::acs::rootdir/packages
     </pre></blockquote></strong></p>"
     set error_p 1
 }
Index: openacs-4/packages/acs-bootstrap-installer/installer/install.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-bootstrap-installer/installer/install.tcl,v
diff -u -N -r1.11.8.2 -r1.11.8.3
--- openacs-4/packages/acs-bootstrap-installer/installer/install.tcl	27 Aug 2013 11:01:48 -0000	1.11.8.2
+++ openacs-4/packages/acs-bootstrap-installer/installer/install.tcl	17 Oct 2013 08:54:59 -0000	1.11.8.3
@@ -124,7 +124,7 @@
 
 # Now process the application bundle if an install.xml file was found.
 
-if { [file exists "[acs_root_dir]/install.xml"] } {
+if { [file exists "$::acs::rootdir/install.xml"] } {
     set output [apm::process_install_xml "/install.xml" {}]
     ns_write "<p>[join $output "</p><p>"]</p>"
 }
Index: openacs-4/packages/acs-bootstrap-installer/tcl/40-db-query-dispatcher-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-bootstrap-installer/tcl/40-db-query-dispatcher-procs.tcl,v
diff -u -N -r1.42.2.5 -r1.42.2.6
--- openacs-4/packages/acs-bootstrap-installer/tcl/40-db-query-dispatcher-procs.tcl	13 Oct 2013 10:22:22 -0000	1.42.2.5
+++ openacs-4/packages/acs-bootstrap-installer/tcl/40-db-query-dispatcher-procs.tcl	17 Oct 2013 08:54:59 -0000	1.42.2.6
@@ -540,7 +540,7 @@
     }
 
     set relative_path [string range $file_tag \
-        [expr { [string length [acs_root_dir]] + 1 }] end]
+        [expr { [string length $::acs::rootdir] + 1 }] end]
     nsv_set apm_library_mtime $relative_path [file mtime $file_tag]
 }
 
Index: openacs-4/packages/acs-content-repository/tcl/acs-content-repository-callback-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/tcl/acs-content-repository-callback-procs.tcl,v
diff -u -N -r1.5 -r1.5.10.1
--- openacs-4/packages/acs-content-repository/tcl/acs-content-repository-callback-procs.tcl	30 Aug 2007 10:21:57 -0000	1.5
+++ openacs-4/packages/acs-content-repository/tcl/acs-content-repository-callback-procs.tcl	17 Oct 2013 08:56:37 -0000	1.5.10.1
@@ -43,7 +43,7 @@
 	
 	if {$relativepath_p} {
 	    # The file location is relative to acs_root_dir
-	    append file_location "[acs_root_dir]/"
+	    append file_location "$::acs::rootdir/"
 	}
 	append file_location [parameter::get_from_package_key -package_key "acs-content-repository" -parameter "CRFileLocationRoot" -default "content-repository-content-files"]
 	
Index: openacs-4/packages/acs-content-repository/tcl/acs-content-repository-init.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/tcl/acs-content-repository-init.tcl,v
diff -u -N -r1.14 -r1.14.10.1
--- openacs-4/packages/acs-content-repository/tcl/acs-content-repository-init.tcl	18 Sep 2007 05:40:30 -0000	1.14
+++ openacs-4/packages/acs-content-repository/tcl/acs-content-repository-init.tcl	17 Oct 2013 08:56:37 -0000	1.14.10.1
@@ -36,7 +36,7 @@
 
     if {$relativepath_p} {
 	# The file location is relative to acs_root_dir
-	append file_location "[acs_root_dir]/"
+	append file_location "$::acs::rootdir/"
     }
     append file_location [parameter::get_from_package_key -package_key "acs-content-repository" -parameter "CRFileLocationRoot" -default "content-repository-content-files"]
     
Index: openacs-4/packages/acs-content-repository/tcl/filter-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/tcl/filter-procs.tcl,v
diff -u -N -r1.33.2.1 -r1.33.2.2
--- openacs-4/packages/acs-content-repository/tcl/filter-procs.tcl	2 Oct 2013 08:42:38 -0000	1.33.2.1
+++ openacs-4/packages/acs-content-repository/tcl/filter-procs.tcl	17 Oct 2013 08:56:37 -0000	1.33.2.2
@@ -24,10 +24,10 @@
 
     If it is not found in any of these places, it defaults to
 
-    [acs_root_dir]/templates
+    $::acs::rootdir/templates
 
     If the value resulting from the search does not start with a '/'
-    it is taken to be relative to [acs_root_dir]
+    it is taken to be relative to $::acs::rootdir
 
     @return the template root (full path from /)
 } {
@@ -46,7 +46,7 @@
 
     if { [string index $template_root 0] ne "/" } {
         # Relative path, prepend server_root
-        set template_root "[acs_root_dir]/$template_root"
+        set template_root "$::acs::rootdir/$template_root"
     }
 
     return [ns_normalizepath $template_root]
Index: openacs-4/packages/acs-content-repository/tcl/test/content-image-test-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/tcl/test/content-image-test-procs.tcl,v
diff -u -N -r1.4 -r1.4.10.1
--- openacs-4/packages/acs-content-repository/tcl/test/content-image-test-procs.tcl	10 Jan 2007 21:22:03 -0000	1.4
+++ openacs-4/packages/acs-content-repository/tcl/test/content-image-test-procs.tcl	17 Oct 2013 08:56:37 -0000	1.4.10.1
@@ -80,7 +80,7 @@
                 -folder_id $first_folder_id \
                 -content_type "image" \
 
-            set tmp_filename "[acs_root_dir]/packages/acs-content-repository/tcl/test/test-image-1.jpg"
+            set tmp_filename "$::acs::rootdir/packages/acs-content-repository/tcl/test/test-image-1.jpg"
             set image_item_id_orig [db_nextval  "acs_object_id_seq"]
             set image_name [ns_mktemp "XXXXXX"]
             set image_item_id [image::new \
Index: openacs-4/packages/acs-content-repository/tcl/test/content-item-test-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/tcl/test/content-item-test-procs.tcl,v
diff -u -N -r1.9 -r1.9.4.1
--- openacs-4/packages/acs-content-repository/tcl/test/content-item-test-procs.tcl	19 Jun 2010 21:20:04 -0000	1.9
+++ openacs-4/packages/acs-content-repository/tcl/test/content-item-test-procs.tcl	17 Oct 2013 08:56:37 -0000	1.9.4.1
@@ -241,7 +241,7 @@
                                  -name $tmp_item_name \
                                  -title $tmp_item_name \
                                  -parent_id $first_folder_id \
-                                 -tmp_filename [acs_root_dir]/packages/acs-content-repository/tcl/test/test.html]
+                                 -tmp_filename $::acs::rootdir/packages/acs-content-repository/tcl/test/test.html]
 
             aa_true "Tmp_filename added cr_item exists" \
                 [expr {[content::item::get_id \
Index: openacs-4/packages/acs-core-docs/tcl/acs-core-docs-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/tcl/acs-core-docs-procs.tcl,v
diff -u -N -r1.4.22.1 -r1.4.22.2
--- openacs-4/packages/acs-core-docs/tcl/acs-core-docs-procs.tcl	27 Aug 2013 11:50:28 -0000	1.4.22.1
+++ openacs-4/packages/acs-core-docs/tcl/acs-core-docs-procs.tcl	17 Oct 2013 08:58:33 -0000	1.4.22.2
@@ -14,7 +14,7 @@
 } {
     set uninstalled [list]
     # Determine which spec files are not installed
-    foreach spec_file [apm_scan_packages "[acs_root_dir]/packages"] {
+    foreach spec_file [apm_scan_packages "$::acs::rootdir/packages"] {
         if { ! [catch {array set version [apm_read_package_info_file $spec_file]} errMsg] } { 
             if { ! [apm_package_registered_p $version(package.key)] } {
                 if {$version(package-name) eq ""} {