#
#
# patch "m4/pcre.m4"
#  from [5d624345448654c16fdf198240cf542c65da0d3b]
#    to [b970b93d32a13a3be9741ffcaf28840f3e37b223]
# 
# patch "win32/README"
#  from [84819b590cf8fd01a3d3fc343a53dd370a16c724]
#    to [acaea5a2768d42ae94b5af5bb4372a4d6f38d6d7]
# 
# patch "win32/monotone.iss"
#  from [b005ec1cafcb4c20780a24a7e2275f84cf0e0d47]
#    to [39034d9615a77f58ffe55a5c04d22e95ec144002]
#
============================================================
--- m4/pcre.m4	5d624345448654c16fdf198240cf542c65da0d3b
+++ m4/pcre.m4	b970b93d32a13a3be9741ffcaf28840f3e37b223
@@ -5,7 +5,7 @@ AC_DEFUN([MTN_LIB_PCRE],
      [use a system-provided copy of libpcre instead of the default bundled
       copy. (To use a specific installed version, use the environment
       variables PCRE_CFLAGS and/or PCRE_LIBS.)]),
-   [case "$withval" in 
+   [case "$withval" in
       (""|yes) with_system_pcre=yes ;;
       (no)     with_system_pcre=no  ;;
       (*)      AC_MSG_ERROR([--with(out)-system-pcre takes no argument]) ;;
@@ -15,6 +15,7 @@ AC_DEFUN([MTN_LIB_PCRE],
    MTN_FIND_PCRE
  fi
  if test $with_system_pcre = no; then
+   AC_DEFINE([PCRE_STATIC],[1],[Define if using bundled pcre])
    AC_MSG_NOTICE([using the bundled copy of PCRE])
  fi
  AM_CONDITIONAL([INCLUDED_PCRE], [test $with_system_pcre = no])
============================================================
--- win32/README	84819b590cf8fd01a3d3fc343a53dd370a16c724
+++ win32/README	acaea5a2768d42ae94b5af5bb4372a4d6f38d6d7
@@ -1 +1,36 @@ This directory keeps the win32 specific 
 This directory keeps the win32 specific files.
+
+To create a MinGW release, the 'make dist' target does not work for
+MinGW. Instead, we use Inno Setup. Here are all the steps for
+creating a MinGW release, on a fresh Windows machine:
+
+Install MinGW tools, and a monotone binary; see
+http://www.venge.net/mtn-wiki/BuildingOnWindows.
+
+Get a copy of the monotone repository; see
+http://www.venge.net/mtn-wiki/SelfHostingInfo
+
+Check out the release version of monotone:
+mtn -d /path/to/monotone.db checkout -r t:monotone-<version> monotone-<version>
+
+Build the release. In an MSYS shell:
+cd monotone-<version>
+autoreconf -i
+./configure
+make
+
+Install Inno Setup; see http://www.jrsoftware.org/isinfo.php
+
+In Inno Setup, open monotone/win32/monotone.iss
+
+If you have installed MinGW in a non-default place, adjust the Source:
+paths to the mingw dlls to match your mingw installation
+
+If you have built monotone in a separate build directory, adjust
+the Source: paths to monotone.exe and monotone.html
+
+Choose menu Build | Compile (or click the "compile" button). This
+generates monotone-<version>-setup.exe in the monotone/win32
+directory.
+
+Publish the binary on the monotone website: TBD
============================================================
--- win32/monotone.iss	b005ec1cafcb4c20780a24a7e2275f84cf0e0d47
+++ win32/monotone.iss	39034d9615a77f58ffe55a5c04d22e95ec144002
@@ -19,7 +19,7 @@ Source: "..\mtn.exe"; DestDir: "{app}"; 
 
 [Files]
 Source: "..\mtn.exe"; DestDir: "{app}"; Flags: ignoreversion
-Source: "..\html\*.*"; DestDir: "{app}\documentation"; Flags: ignoreversion
+Source: "..\monotone.html"; DestDir: "{app}\documentation"; Flags: ignoreversion
 Source: "..\figures\*.png"; DestDir: "{app}\documentation\figures"; Flags: ignoreversion
 Source: "..\COPYING"; DestDir: "{app}"; Flags: ignoreversion
 Source: "..\po\de.gmo"; DestDir: "{app}\locale\de\LC_MESSAGES"; DestName: "monotone.mo"; Flags: ignoreversion
@@ -38,10 +38,10 @@ Name: viewdocs; Description: "View the m
 Name: viewdocs; Description: "View the monotone documentation"; GroupDescription: "Get up and running"
 
 [Run]
-Filename: "{app}\documentation\index.html"; Tasks: viewdocs; Flags: shellexec nowait; WorkingDir: "{app}\documentation"
+Filename: "{app}\documentation\monotone.html"; Tasks: viewdocs; Flags: shellexec nowait; WorkingDir: "{app}\documentation"
 
 [Icons]
-Name: "{group}\monotone documentation"; Filename: "{app}\documentation\index.html"; WorkingDir: "{app}"
+Name: "{group}\monotone documentation"; Filename: "{app}\documentation\monotone.html"; WorkingDir: "{app}"
 
 [Code]
 function ModPathDir(): String;