Fixup some release code

scripts/release.sh

@@ -11,7 +11,7 @@ echo "About to release $v"
 read -p "Are you sure you are ready: " N
 [ "$N" != "YES" ] && exit
 
-sed -ri "s/MAJOR_VERSION=[0-9]+ MINOR_VERSION=[0-9]+ PATCH_VERSION=[0-9]+ BUILD=\"[^#*]\"/MAJOR_VERSION=$1 MINOR_VERSION=$2 PATCH_VERSION=$3 BUILD=\"$4\"/" wkhtmltopdf.pro || exit 1
+sed -ri "s/MAJOR_VERSION=[0-9]+ MINOR_VERSION=[0-9]+ PATCH_VERSION=[0-9]+ BUILD=.*/MAJOR_VERSION=$1 MINOR_VERSION=$2 PATCH_VERSION=$3 BUILD=\"$4\"/" wkhtmltopdf.pro || exit 1
 
 rm -rf wkhtmltopdf-i386 wkhtmltopdf-amd64 wkhtmltopdf.exe wkhtmltopdf
 ./scripts/static-build.sh linux-i386 || (echo Build failed; exit 1)

scripts/static-build.sh

@@ -215,7 +215,7 @@ EOF
     cd qts
     if ! cmp conf conf_new; then
 	QTDIR=. bin/syncqt || exit 1
-	(yes | wine configure.exe -I "C:\qts\include" -I "C:\mingw32\include\freetype2" `cat conf_new` -prefix "C:\qt" --help  && cp conf_new conf) || exit 1
+	(yes | wine configure.exe -I "C:\qts\include" -I "C:\mingw32\include\freetype2" `cat conf_new` -prefix "C:\qt"  && cp conf_new conf) || exit 1
     fi
     if ! wine mingw32-make -j3 -q; then
 	wine mingw32-make -j3 || exit 1