X-Git-Url: http://git.rot13.org/?p=BackupPC.git;a=blobdiff_plain;f=makeDist;fp=makeDist;h=ec18f4423f1666af7f25e3d3ab942da2ac3aa2ff;hp=b8f4361974cdffee27cf9957a7ec24479768d7f6;hb=e4bf7ab080e172b74b3d64c196a72d0ff5d315c5;hpb=caa62f13e4ab659d296afbce7bcd01c3c77cf7bb

diff --git a/makeDist b/makeDist
index b8f4361..ec18f44 100755
--- a/makeDist
+++ b/makeDist
@@ -53,8 +53,8 @@ die("BackupPC::Lib->new failed\n")
 
 umask(0022);
 
-my $Version     = "3.0.0beta3";
-my $ReleaseDate = "3 Dec 2006";
+my $Version     = "3.0.0";
+my $ReleaseDate = "21 Jan 2007";
 my $DistDir     = "dist/BackupPC-$Version";
 
 my @PerlSrc = qw(
@@ -270,24 +270,15 @@ sub InstallFile
 	    s/__RELEASEDATE__/$ReleaseDate/g;
 	    if ( $file =~ /BackupPC\.html$/ ) {
 		#
-		# fixup for perl 5.6.x
+		# fixup for conf links
 		#
-		if ( !/A NAME="item_(%|_)24Conf/i ) {
+		if ( !/A NAME="item_(%|_)conf/i ) {
 		    s/\$Conf{([^}]*)}/
 			defined($ConfName{$1})
-			    ? "\L<A HREF=\"#$ConfName{$1}\">\E\$Conf{$1}<\/A>"
+			    ? "\L<a href=\"#$ConfName{$1}\">\E\$Conf{$1}<\/A>"
 			    : "\$Conf{$1}"/eg;
 		}
-		s/<(A NAME="item_(%|_)24Conf(%|_)7B(.*?)(%|_)7D).*?">/\L<A NAME="item_%24Conf%7b$4%7d">/ig;
 		s/^<DD>/<DD><P>/;
-		#
-		# Fixup for perl 5.8.x first one no longer needed after
-		# fix in CSS)
-		#
-#		if ( /^<\/dt>/ ) {
-#		    $_ .= <FILE>;
-#		    s/^(<\/dt>\n<dd>)/$1<p>/s;
-#		}
 		s/^<li><\/li>/<li>/;
 	    }
 	    if ( /__CONFIGPOD__/ ) {
@@ -356,10 +347,8 @@ sub config2pod
                 s/([^;])\s*$/$1 .../;
             }
             push(@conf, $_);
-            my $text = "\$Conf{$var}";
-            $text =~ s/\s+/_/sg;
-            $text =~ s{(\W)}{sprintf("%%%02X", ord($1) )}gxe;
-            $text = substr($text, 0, 50);
+            my $text = "_conf_${var}_";
+            $text =~ s{[\W\s]}{_}g;
             $ConfName{$var} = "item_$text";
         } elsif ( /^$/ ) {
             if ( $str ne "" && @conf ) {