--- bin.org/publish	Tue Apr  1 22:33:31 2003
+++ bin/publish	Tue Apr  1 22:38:37 2003
@@ -396,8 +396,9 @@
 	# Remove base tag  - DZA
 	$tmpl =~ s/<base[^>]+\/>//;
 	# Fix some links - DZA
-	$tmpl =~ s!<a href=\"(?:http://localhost)?/bin/view/$web/!<a href=\"!go;
-	$tmpl =~ s!<a href=\"(?:http://localhost)?/bin/view/([/A-Za-z0-9_]+)((\#[^\"]+)?)\"!<a href=\"../$1.html$2\"!go;
+	my ($scriptDir) = &TWiki::Func::getScriptUrlPath();
+	$tmpl =~ s!<a href=\"(?:http://localhost)?$scriptDir/view/$web/!<a href=\"!goi;
+	$tmpl =~ s!<a href=\"(?:http://localhost)?$scriptDir/view/([/A-Za-z0-9_]+)((\#[^\"]+)?)\"!<a href=\"../$1.html$2\"!goi;
 	
 	# Insert .html in internal links.