Index: openacs-4/packages/acs-admin/tcl/apm-admin-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/tcl/apm-admin-procs.tcl,v
diff -u -r1.18.8.6 -r1.18.8.7
--- openacs-4/packages/acs-admin/tcl/apm-admin-procs.tcl	11 Oct 2013 11:43:46 -0000	1.18.8.6
+++ openacs-4/packages/acs-admin/tcl/apm-admin-procs.tcl	17 Oct 2013 08:44:30 -0000	1.18.8.7
@@ -122,7 +122,7 @@
         incr counter
         set package_key [pkg_info_key $pkg_info]
         set package_path [pkg_info_path $pkg_info]
-        set package_rel_path [string range $package_path [string length [acs_root_dir]] end]
+        set package_rel_path [string range $package_path [string length $::acs::rootdir] end]
         set spec_file [pkg_info_spec $pkg_info]
         array set package [apm_read_package_info_file $spec_file]
         set version_name $package(name)
@@ -294,14 +294,14 @@
     # Configuration Settings
     #----------------------------------------------------------------------
 
-    set cd_helper 		"[acs_root_dir]/bin/cd-helper"
+    set cd_helper 		"$::acs::rootdir/bin/cd-helper"
 
     set cvs_command 		"cvs"
     set cvs_root 		":pserver:anonymous@cvs.openacs.org:/cvsroot"
 
-    set work_dir 		"[acs_root_dir]/repository-builder/"
+    set work_dir 		"$::acs::rootdir/repository-builder/"
 
-    set repository_dir 		"[acs_root_dir]/www/repository/"
+    set repository_dir 		"$::acs::rootdir/www/repository/"
     set repository_url 		"http://openacs.org/repository/"
 
     set channel_index_template  "/packages/acs-admin/www/apm/repository-channel-index"
Index: openacs-4/packages/acs-admin/www/developer.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/developer.adp,v
diff -u -r1.2.16.1 -r1.2.16.2
--- openacs-4/packages/acs-admin/www/developer.adp	11 Sep 2013 18:40:04 -0000	1.2.16.1
+++ openacs-4/packages/acs-admin/www/developer.adp	17 Oct 2013 08:44:30 -0000	1.2.16.2
@@ -52,11 +52,11 @@
       <ul>
       <li>
 	<b>Customize the front page</b>. Edit the files
-      <code>@acs_root_dir@/www/index.adp</code> and
-      <code>@acs_root_dir@/www/index.tcl</code>.  (<a
+      <code>@acs::rootdir@/www/index.adp</code> and
+      <code>@acs::rootdir@/www/index.tcl</code>.  (<a
       href="/doc/templates.html">More information</a>)
       </li>
-      <li>Change the site's overall appearance by <b>editing the master template</b> that wraps every page. The master template is <code>@acs_root_dir@/www/default-master.adp</code>.       An ADP file is almost like HTML, except with a few extra bells
+      <li>Change the site's overall appearance by <b>editing the master template</b> that wraps every page. The master template is <code>@acs::rootdir@/www/default-master.adp</code>.       An ADP file is almost like HTML, except with a few extra bells
       and whistles (<a href="/doc/acs-templating/designer-guide.html"
       title="Templating Designer's Guide">more information</a>).</li>
 
Index: openacs-4/packages/acs-admin/www/developer.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/developer.tcl,v
diff -u -r1.1 -r1.1.22.1
--- openacs-4/packages/acs-admin/www/developer.tcl	21 Sep 2003 19:21:47 -0000	1.1
+++ openacs-4/packages/acs-admin/www/developer.tcl	17 Oct 2013 08:44:30 -0000	1.1.22.1
@@ -9,5 +9,3 @@
 
 set page_title "Developer's Administration"
 set context [list $page_title]
-
-set acs_root_dir [acs_root_dir]
Index: openacs-4/packages/acs-admin/www/apm/package-load.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/package-load.adp,v
diff -u -r1.1.2.1 -r1.1.2.2
--- openacs-4/packages/acs-admin/www/apm/package-load.adp	28 Sep 2013 08:36:17 -0000	1.1.2.1
+++ openacs-4/packages/acs-admin/www/apm/package-load.adp	17 Oct 2013 08:44:30 -0000	1.1.2.2
@@ -8,7 +8,7 @@
 You can retrieve a package archive to prepare for installation by using
 one of the options below.  
 Otherwise, please specify a filesystem location for the packages you want to install.
-You can also copy the extracted package files directly into the <code>@acs_root_dir@/packages/</code> directory if you prefer.
+You can also copy the extracted package files directly into the <code>@acs::rootdir@/packages/</code> directory if you prefer.
 <p>
 
 Load a package from the <tt>.apm</tt> file at this URL:
Index: openacs-4/packages/acs-admin/www/apm/package-load.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/package-load.tcl,v
diff -u -r1.2.26.1 -r1.2.26.2
--- openacs-4/packages/acs-admin/www/apm/package-load.tcl	28 Sep 2013 08:36:17 -0000	1.2.26.1
+++ openacs-4/packages/acs-admin/www/apm/package-load.tcl	17 Oct 2013 08:44:30 -0000	1.2.26.2
@@ -8,6 +8,6 @@
 
 set title "Load a New Package"
 set context [list [list "/acs-admin/apm/" "Package Manager"] $title]
-set acs_root_dir [acs_root_dir]
 
 
+
Index: openacs-4/packages/acs-admin/www/apm/packages-install.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/packages-install.tcl,v
diff -u -r1.22.4.4 -r1.22.4.5
--- openacs-4/packages/acs-admin/www/apm/packages-install.tcl	2 Oct 2013 07:46:31 -0000	1.22.4.4
+++ openacs-4/packages/acs-admin/www/apm/packages-install.tcl	17 Oct 2013 08:44:30 -0000	1.22.4.5
@@ -23,7 +23,7 @@
 #
 # TODO: make sure that it's a later version than that in the packages dir?
 #
-set packages_root_dir "[acs_root_dir]/packages"
+set packages_root_dir "$::acs::rootdir/packages"
 set packages_spec_files [apm_scan_packages $packages_root_dir]
 set workspace_spec_files [apm_scan_packages [apm_workspace_install_dir]]
 set workspace_filenames [list]
Index: openacs-4/packages/acs-admin/www/apm/version-i18n-process-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/version-i18n-process-2.tcl,v
diff -u -r1.16.8.1 -r1.16.8.2
--- openacs-4/packages/acs-admin/www/apm/version-i18n-process-2.tcl	27 Aug 2013 11:44:43 -0000	1.16.8.1
+++ openacs-4/packages/acs-admin/www/apm/version-i18n-process-2.tcl	17 Oct 2013 08:44:30 -0000	1.16.8.2
@@ -67,7 +67,7 @@
 
     ns_log Notice "Replacing text in file $text_file with message tags"
     append processing_html_result "<h3>Text replacements for $text_file</h3>"
-    set adp_text_result_list [lang::util::replace_adp_text_with_message_tags "[acs_root_dir]/$text_file" write $message_key_list]
+    set adp_text_result_list [lang::util::replace_adp_text_with_message_tags "$::acs::rootdir/$text_file" write $message_key_list]
     set text_replacement_list [lindex $adp_text_result_list 0]
     set text_untouched_list [lindex $adp_text_result_list 1]
 
Index: openacs-4/packages/acs-admin/www/apm/version-i18n-process.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/version-i18n-process.tcl,v
diff -u -r1.3 -r1.3.22.1
--- openacs-4/packages/acs-admin/www/apm/version-i18n-process.tcl	29 Oct 2002 08:14:24 -0000	1.3
+++ openacs-4/packages/acs-admin/www/apm/version-i18n-process.tcl	17 Oct 2013 08:44:30 -0000	1.3.22.1
@@ -32,9 +32,9 @@
 # Process one adp at a time interactively
 set file [lindex $files 0]
 
-set full_file_name "[acs_root_dir]/$file"
+set full_file_name "$::acs::rootdir/$file"
 
-set adp_report_list [lang::util::replace_adp_text_with_message_tags "[acs_root_dir]/$file" report]
+set adp_report_list [lang::util::replace_adp_text_with_message_tags "$::acs::rootdir/$file" report]
 set adp_replace_list [lindex $adp_report_list 0]
 set adp_no_replace_list [lindex $adp_report_list 1]
 
Index: openacs-4/packages/acs-admin/www/install/install-3.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/install/install-3.tcl,v
diff -u -r1.9.10.1 -r1.9.10.2
--- openacs-4/packages/acs-admin/www/install/install-3.tcl	27 Aug 2013 11:44:43 -0000	1.9.10.1
+++ openacs-4/packages/acs-admin/www/install/install-3.tcl	17 Oct 2013 08:44:30 -0000	1.9.10.2
@@ -64,7 +64,7 @@
         set package_path "[apm_workspace_install_dir]/$package_key"
     } else {
         set spec_file $version(path)
-        set package_path "[acs_root_dir]/packages/$package_key"
+        set package_path "$::acs::rootdir/packages/$package_key"
     }
         
     set final_version_name $version(name)
Index: openacs-4/packages/acs-lang/tcl/lang-util-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/tcl/lang-util-procs.tcl,v
diff -u -r1.47.2.2 -r1.47.2.3
--- openacs-4/packages/acs-lang/tcl/lang-util-procs.tcl	2 Oct 2013 09:10:22 -0000	1.47.2.2
+++ openacs-4/packages/acs-lang/tcl/lang-util-procs.tcl	17 Oct 2013 08:37:12 -0000	1.47.2.3
@@ -137,7 +137,7 @@
     is not accessed in any way.
 
     @param file_list         A list of paths to adp or tcl files to do replacements in. The
-                             paths should be relative to [acs_root_dir]. All files must
+                             paths should be relative to $::acs::rootdir. All files must
                              belong to the same package.
 
     @author Peter marklund (peter@collaboraid.biz)
@@ -176,7 +176,7 @@
     foreach file $file_list {                
         ns_log debug "lang::util::replace_temporary_tags_with_lookups: processing file $file"
 
-        set full_file_path "[acs_root_dir]/$file"
+        set full_file_path "$::acs::rootdir/$file"
         regexp {\.([^.]+)$} $file match file_ending
 
         # Attempt a backup of the file first. Do not overwrite an old backup file.
Index: openacs-4/packages/acs-lang/tcl/test/acs-lang-test-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/tcl/test/acs-lang-test-procs.tcl,v
diff -u -r1.17.10.2 -r1.17.10.3
--- openacs-4/packages/acs-lang/tcl/test/acs-lang-test-procs.tcl	2 Oct 2013 09:10:22 -0000	1.17.10.2
+++ openacs-4/packages/acs-lang/tcl/test/acs-lang-test-procs.tcl	17 Oct 2013 08:37:12 -0000	1.17.10.3
@@ -34,7 +34,7 @@
 ad_proc -private lang::test::setup_test_package {} {
     set package_key [test_package_key]
     set package_name "acs-lang temporary test package"
-    set package_dir [file join [acs_root_dir] packages $package_key]
+    set package_dir [file join $::acs::rootdir packages $package_key]
     file mkdir $package_dir
 
     set info_file_path "${package_dir}/${package_key}.info"
@@ -500,7 +500,7 @@
     set expected_new_keys [list Auto_Key key_1_1] 
 
     # Write the test tcl file
-    set tcl_file_id [open "[acs_root_dir]/$tcl_file" w]    
+    set tcl_file_id [open "$::acs::rootdir/$tcl_file" w]    
     set new_key_1 "_"
     set new_text_1 "Auto Key"
     set new_key_2 "key_1"
@@ -551,7 +551,7 @@
                                                    $messages_array($new_key_3)]
 
     # Check that there are no tags left in the tcl file
-    set tcl_file_id [open "[acs_root_dir]/$tcl_file" r]
+    set tcl_file_id [open "$::acs::rootdir/$tcl_file" r]
     set updated_tcl_contents [read $tcl_file_id]
     close $tcl_file_id
     aa_true "tags in tcl file replaced" [expr {[llength [lang::util::get_temporary_tags_indices $updated_tcl_contents]] == 0}]
@@ -565,8 +565,8 @@
     file delete $catalog_file
 
     # Delete the tcl files
-    file delete "[acs_root_dir]/$tcl_file"
-    file delete "[acs_root_dir]/$tcl_backup_file"
+    file delete "$::acs::rootdir/$tcl_file"
+    file delete "$::acs::rootdir/$tcl_backup_file"
 }
 
 aa_register_case \
Index: openacs-4/packages/acs-lang/www/admin/lookups-include.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/Attic/lookups-include.tcl,v
diff -u -r1.3 -r1.3.22.1
--- openacs-4/packages/acs-lang/www/admin/lookups-include.tcl	19 Dec 2002 15:31:44 -0000	1.3
+++ openacs-4/packages/acs-lang/www/admin/lookups-include.tcl	17 Oct 2013 08:37:12 -0000	1.3.22.1
@@ -3,7 +3,7 @@
 set full_key_pattern "${package_key}.([join $message_key_list "|"])"
 
 set message_key_context ""
-if { [catch {set message_key_context [exec find [acs_root_dir] -type f -regex ".*\\.\\(info\\|adp\\|sql\\|tcl\\)" | xargs egrep "${full_key_pattern}"]} error] } {
+if { [catch {set message_key_context [exec find $::acs::rootdir -type f -regex ".*\\.\\(info\\|adp\\|sql\\|tcl\\)" | xargs egrep "${full_key_pattern}"]} error] } {
     global errorInfo
     regexp "^(.*)child process exited abnormally" $errorInfo match message_key_context
     set message_key_context [ad_quotehtml $message_key_context]
Index: openacs-4/packages/acs-lang/www/admin/message-usage-include.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/message-usage-include.tcl,v
diff -u -r1.5.10.1 -r1.5.10.2
--- openacs-4/packages/acs-lang/www/admin/message-usage-include.tcl	2 Oct 2013 09:10:22 -0000	1.5.10.1
+++ openacs-4/packages/acs-lang/www/admin/message-usage-include.tcl	17 Oct 2013 08:37:12 -0000	1.5.10.2
@@ -18,9 +18,9 @@
 multirow create message_usage file code
 
 with_catch errmsg {
-    exec find [acs_root_dir] -type f -regex ".*\\.\\(info\\|adp\\|sql\\|tcl\\)" -follow | xargs egrep "$grepfor" 2>/dev/null
+    exec find $::acs::rootdir -type f -regex ".*\\.\\(info\\|adp\\|sql\\|tcl\\)" -follow | xargs egrep "$grepfor" 2>/dev/null
 } {
-    #error "find [acs_root_dir] -type f -regex \".*\\.\\(info\\|adp\\|sql\\|tcl\\)\" -follow | xargs egrep \"${full_key_pattern}\""
+    #error "find $::acs::rootdir -type f -regex \".*\\.\\(info\\|adp\\|sql\\|tcl\\)\" -follow | xargs egrep \"${full_key_pattern}\""
     global errorInfo
 
     foreach line [split $errmsg "\n"] {