Index: openacs-4/packages/acs-bootstrap-installer/installer/tcl/0-acs-init.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-bootstrap-installer/installer/tcl/0-acs-init.tcl,v
diff -u -r1.2.2.1 -r1.2.2.2
--- openacs-4/packages/acs-bootstrap-installer/installer/tcl/0-acs-init.tcl	17 Aug 2015 16:43:55 -0000	1.2.2.1
+++ openacs-4/packages/acs-bootstrap-installer/installer/tcl/0-acs-init.tcl	20 Aug 2015 10:57:13 -0000	1.2.2.2
@@ -9,12 +9,16 @@
 
 namespace eval acs {
     #
+    # Determine, under which server we are running
+    #
+    set ::acs::useNaviServer [expr {[ns_info name] eq "NaviServer"}]
+    #
     # Handling NaviServer deprecated ns_info subcommands. 
     #
-    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]}]
-    set ::acs::rootdir  [file dirname [string trimright $::acs::tcllib "/"]]
+    set ::acs::pageroot [expr {$::acs::useNaviServer ? [ns_server pagedir] : [ns_info pageroot]}]
+    set ::acs::tcllib   [expr {$::acs::useNaviServer ? [ns_server tcllib] : [ns_info tcllib]}]
     #
+    set ::acs::rootdir  [file dirname [string trimright $::acs::tcllib "/"]]
     set ::acs::useNsfProc [expr {[info commands ::nsf::proc] ne ""}]
 }