Index: openacs-4/packages/acs-tcl/tcl/apm-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/apm-procs.tcl,v
diff -u -r1.94.2.9 -r1.94.2.10
--- openacs-4/packages/acs-tcl/tcl/apm-procs.tcl	12 Oct 2013 13:55:17 -0000	1.94.2.9
+++ openacs-4/packages/acs-tcl/tcl/apm-procs.tcl	16 Oct 2013 19:49:09 -0000	1.94.2.10
@@ -201,7 +201,7 @@
         }
         switch $dependency_type {
             extends -
-            "" { lappend apm_package_url_resolution [acs_root_dir]/packages/$package_key/www }
+            "" { lappend apm_package_url_resolution $::acs::rootdir/packages/$package_key/www }
             embeds {
 
                # Reference to an embedded package is through URLs relative to the embedding
@@ -213,18 +213,18 @@
                # as the request processor will not perform the expected permission check.
 
                lappend apm_package_url_resolution \
-                   [list [acs_root_dir]/packages/$package_key/embed/admin admin/$package_key]
+                   [list $::acs::rootdir/packages/$package_key/embed/admin admin/$package_key]
                lappend apm_package_url_resolution \
                    [list "" $package_key/admin]
 
                lappend apm_package_url_resolution \
-                   [list [acs_root_dir]/packages/$package_key/embed/sitewide-admin \
+                   [list $::acs::rootdir/packages/$package_key/embed/sitewide-admin \
                        sitewide-admin/$package_key]
                lappend apm_package_url_resolution \
                    [list "" $package_key/sitewide-admin]
 
                lappend apm_package_url_resolution \
-                   [list [acs_root_dir]/packages/$package_key/embed $package_key]
+                   [list $::acs::rootdir/packages/$package_key/embed $package_key]
             }
             default {
                 error "apm_package_list_url_resolution: dependency type is $dependency_type"
@@ -392,7 +392,7 @@
 } {
     set changed_files [list]
     foreach relative_path $file_list {
-        set full_path "[acs_root_dir]/$relative_path"
+        set full_path "$::acs::rootdir/$relative_path"
 
 	# If the file exists, and either has never been loaded or has an mtime
 	# which differs the mtime it had when last loaded, mark to be loaded.
@@ -668,12 +668,12 @@
     set files [list]    
     foreach package $packages {
 
-        set files [ad_find_all_files [acs_root_dir]/packages/$package]
+        set files [ad_find_all_files $::acs::rootdir/packages/$package]
         if { [llength $files] == 0 } {
-    	    ns_log Error "apm_load_queries: Unable to locate [acs_root_dir]/packages/$package/*. when scanning for SQL queries to load."
+    	    ns_log Error "apm_load_queries: Unable to locate $::acs::rootdir/packages/$package/*. when scanning for SQL queries to load."
         }
 
-        set testdir    "[acs_root_dir]/packages/$package/tcl/test"
+        set testdir    "$::acs::rootdir/packages/$package/tcl/test"
         set testlength [string length $testdir]
 
         foreach file [lsort $files] {
@@ -770,7 +770,7 @@
     # changed.
     set files_to_reload [list]
     foreach file [nsv_array names apm_reload_watch] {
-	set path "[acs_root_dir]/$file"
+	set path "$::acs::rootdir/$file"
 	ns_log Debug "APM: File being watched: $path"
 
 	if { [file exists $path] 
@@ -810,7 +810,7 @@
 		    ns_log Notice "apm_load_any_changed_libraries: Reloading *-procs.tcl files in this interpreter..."
 		}
 		# File is usually of form packages/package_key
-		set file_path "[acs_root_dir]/$file"
+		set file_path "$::acs::rootdir/$file"
                 set file_ext [file extension $file_path]
                 
                 switch $file_ext {