Join paths with 'file join' not as strings to avoid platform-specific separator problems

1 files changed, 3 insertions, 2 deletions

diff --git a/tools/tcltk-man2html.tcl b/tools/tcltk-man2html.tcl
index 1028ae5..a599e8f 100755
--- a/tools/tcltk-man2html.tcl
+++ b/tools/tcltk-man2html.tcl
@@ -148,6 +148,7 @@ proc parse_command_line {} {
 	# Use default packages dir.
 	set pkgsDir [file join $tcltkdir $tcldir pkgs]
     }
+    set pkgsDir [file normalize $pkgsDir] 
     puts "using Packages source directory $pkgsDir"
 
     puts "verbose messages are [expr {$verbose ? {on} : {off}}]"
@@ -474,10 +475,10 @@ proc plus-pkgs {type args} {
     if {!$build_tcl} return
     set result {}
     foreach {dir name version} $args {
-	set globpat $pkgsDir/$dir/doc/*.$type
+	set globpat [file join $pkgsDir $dir doc *.$type]
 	if {![llength [glob -type f -nocomplain $globpat]]} {
 	    # Fallback for manpages generated using doctools
-	    set globpat $pkgsDir/$dir/doc/man/*.$type
+	    set globpat [file join $pkgsDir $dir doc man *.$type]
 	    if {![llength [glob -type f -nocomplain $globpat]]} {
 		continue
 	    }