[PATCH] Update win32 installer with changes from f91e5630ce7e

[Steve Borho]

On Thu, Dec 3, 2009 at 3:35 PM, Pascal Quantin <pascal.quantin at gmail.com> wrote:
> # HG changeset patch
> # User Pascal Quantin <pascal.quantin at gmail.com>
> # Date 1259876091 -3600
> # Node ID 0f6373bd64f542f52e22c28ce43c588d31519aae
> # Parent  16f49d671c7f076d046e641f50a0c6cefa4ee2c9
> Update win32 installer with changes from f91e5630ce7e

Nightly builds of hg-main will not be possible until these changes are
pulled from crew into main.

> diff --git a/contrib/win32/mercurial.iss b/contrib/win32/mercurial.iss
> --- a/contrib/win32/mercurial.iss
> +++ b/contrib/win32/mercurial.iss
> @@ -62,9 +62,9 @@
>  Source: dist\add_path.exe; DestDir: {app}
>  Source: doc\*.html; DestDir: {app}\Docs
>  Source: doc\style.css; DestDir: {app}\Docs
> -Source: help\*.txt; DestDir: {app}\help
> +Source: mercurial\help\*.txt; DestDir: {app}\help
>  Source: locale\*.*; DestDir: {app}\locale; Flags: recursesubdirs createallsubdirs
> -Source: templates\*.*; DestDir: {app}\Templates; Flags: recursesubdirs createallsubdirs
> +Source: mercurial\templates\*.*; DestDir: {app}\Templates; Flags: recursesubdirs createallsubdirs
>  Source: CONTRIBUTORS; DestDir: {app}; DestName: Contributors.txt
>  Source: COPYING; DestDir: {app}; DestName: Copying.txt
>
> diff --git a/doc/Makefile b/doc/Makefile
> --- a/doc/Makefile
> +++ b/doc/Makefile
> @@ -1,7 +1,7 @@
>  SOURCES=$(wildcard *.[0-9].txt)
>  MAN=$(SOURCES:%.txt=%)
>  HTML=$(SOURCES:%.txt=%.html)
> -GENDOC=gendoc.py ../mercurial/commands.py ../mercurial/help.py ../help/*.txt
> +GENDOC=gendoc.py ../mercurial/commands.py ../mercurial/help.py ../mercurial/help/*.txt
>  PREFIX=/usr/local
>  MANDIR=$(PREFIX)/share/man
>  INSTALL=install -c -m 644
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel at selenic.com
> http://selenic.com/mailman/listinfo/mercurial-devel
>

--
Steve Borho