- some fixed for make_win_src_distribution to work properly

Build-tools/Bootstrap

@@ -310,10 +310,6 @@ $command= "make dist";
 if ($opt_win_dist)
 {
 	&logger ("Creating Windows source package");
-	chdir("scripts");
-	$command= "make make_win_src_distribution";
-	&run_command($command, "make make_win_src_distribution failed!");
-	chdir("..");
 	$command= "./scripts/make_win_src_distibution";
 	&run_command($command, "make_win_src_distribution failed!");
 }

scripts/Makefile.am

@@ -17,6 +17,7 @@
 ## Process this file with automake to create Makefile.in
 
 bin_SCRIPTS =		@server_scripts@ \
+			make_win_src_distribution \
 			msql2mysql \
 			mysql_config \
 			mysql_fix_privilege_tables \

scripts/make_win_src_distribution.sh

@@ -128,9 +128,7 @@ find $BASE \( -name "*.dsp" -o -name "*.dsw" \) -and -not -path \*SCCS\* -print
     print_debug "Replacing LF -> CRLF from '$v'"
 
     # ^M -> type CTRL V + CTRL M 
-    cat $v | sed 's/
-//' | sed 's/$/
-/' > $v.tmp
+    cat $v | sed 's/
//' | sed 's/$/
/' > $v.tmp
     rm $v
     mv $v.tmp $v
   done