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 -N -r1.41.2.1 -r1.41.2.2 --- openacs-4/packages/acs-bootstrap-installer/tcl/00-proc-procs.tcl 16 Aug 2013 19:07:36 -0000 1.41.2.1 +++ openacs-4/packages/acs-bootstrap-installer/tcl/00-proc-procs.tcl 21 Aug 2013 11:27:04 -0000 1.41.2.2 @@ -954,8 +954,3 @@ return 1 } - -# handling NaviServer deprecated ns_info subcommands. -namespace eval acs {} -set ::acs::pageroot [expr {[catch {ns_server pagedir}] ? [ns_info pageroot] : [ns_server pagedir]}] -set ::acs::tcllib [expr {[catch {ns_server tcllib}] ? [ns_info tcllib] : [ns_server tcllib]}] Index: openacs-4/tcl/0-acs-init.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/tcl/0-acs-init.tcl,v diff -u -N -r1.6 -r1.6.10.1 --- openacs-4/tcl/0-acs-init.tcl 10 Jan 2007 21:22:14 -0000 1.6 +++ openacs-4/tcl/0-acs-init.tcl 21 Aug 2013 11:27:04 -0000 1.6.10.1 @@ -7,9 +7,14 @@ # # $Id$ +# handling NaviServer deprecated ns_info subcommands. +namespace eval acs {} +set ::acs::pageroot [expr {[catch {ns_server pagedir}] ? [ns_info pageroot] : [ns_server pagedir]}] +set ::acs::tcllib [expr {[catch {ns_server tcllib}] ? [ns_info tcllib] : [ns_server tcllib]}] + # Determine the OpenACS root directory, which is the directory right above the -# Tcl library directory [ns_info tcllib]. -set root_directory [file dirname [string trimright [ns_info tcllib] "/"]] +# Tcl library directory ::acs::tcllib. +set root_directory [file dirname [string trimright ${::acs::tcllib} "/"]] nsv_set acs_properties root_directory $root_directory ns_log "Notice" "Loading OpenACS, rooted at $root_directory" Index: openacs-4/tcl/zz-postload.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/tcl/zz-postload.tcl,v diff -u -N -r1.5 -r1.5.16.1 --- openacs-4/tcl/zz-postload.tcl 3 Mar 2005 18:17:11 -0000 1.5 +++ openacs-4/tcl/zz-postload.tcl 21 Aug 2013 11:27:04 -0000 1.5.16.1 @@ -4,10 +4,8 @@ # Date: 24 Feb 2000 # Description: Sources library files that need to be loaded after the rest. -set tcllib [ns_info tcllib] - ns_log "Notice" "Sourcing files for postload..." -foreach file [glob -nocomplain ${tcllib}/*.tcl.postload] { +foreach file [glob -nocomplain ${::acs::tcllib}/*.tcl.postload] { ns_log Notice "postloading $file" source "$file" }