]> git.pld-linux.org Git - packages/ghc.git/blame - ghc-winpaths.patch
- updated pkgdir patch
[packages/ghc.git] / ghc-winpaths.patch
CommitLineData
332fb80a
JR
1diff -ur ghc-7.2.1-winpaths/docs/users_guide/ghci.xml ghc-7.2.1/docs/users_guide/ghci.xml
2--- ghc-7.2.1-winpaths/docs/users_guide/ghci.xml 2011-09-26 17:55:05.824214356 +0200
3+++ ghc-7.2.1/docs/users_guide/ghci.xml 2011-08-07 19:10:05.000000000 +0200
4@@ -126,7 +126,7 @@
5 directory of the shell from which it was started. If you started
6 GHCi from the “Start” menu in Windows, then the
7 current directory is probably something like
8- <filename>C:\Documents and Settings\<replaceable>user
9+ <filename>C:\\Documents and Settings\\<replaceable>user
10 name</replaceable></filename>.</para> </footnote> then we will
11 need to change to the right directory in GHCi:</para>
12
13diff -ur ghc-7.2.1-winpaths/docs/users_guide/packages.xml ghc-7.2.1/docs/users_guide/packages.xml
14--- ghc-7.2.1-winpaths/docs/users_guide/packages.xml 2011-09-26 17:56:23.484450567 +0200
15+++ ghc-7.2.1/docs/users_guide/packages.xml 2011-08-07 19:10:05.000000000 +0200
16@@ -396,7 +396,7 @@
17 systems this will be
18 <filename>$HOME/.ghc/<replaceable>arch</replaceable>-<replaceable>os</replaceable>-<replaceable>version</replaceable>/package.conf.d</filename>, and on
19 Windows it will be something like
20- <filename>C:\Documents&nbsp;And&nbsp;Settings\<replaceable>user</replaceable>\ghc\package.conf.d</filename>.
21+ <filename>C:\\Documents&nbsp;And&nbsp;Settings\\<replaceable>user</replaceable>\\ghc\\package.conf.d</filename>.
22 The <literal>ghc-pkg</literal> tool knows where this file should be
23 located, and will create it if it doesn't exist (see <xref linkend="package-management" />).</para>
24 </listitem>
25diff -ur ghc-7.2.1-winpaths/docs/users_guide/using.xml ghc-7.2.1/docs/users_guide/using.xml
26--- ghc-7.2.1-winpaths/docs/users_guide/using.xml 2011-09-26 17:58:56.791496986 +0200
27+++ ghc-7.2.1/docs/users_guide/using.xml 2011-08-07 19:10:05.000000000 +0200
28@@ -72,7 +72,7 @@
29 by directory separators). For example, the
30 module <literal>Data.Person</literal> would be in the
31 file <filename>Data/Person.hs</filename> on Unix/Linux/Mac,
32- or <filename>Data\Person.hs</filename> on Windows.
33+ or <filename>Data\\Person.hs</filename> on Windows.
34 </para>
35 </sect1>
36
37diff -ur ghc-7.2.1-winpaths/docs/users_guide/win32-dlls.xml ghc-7.2.1/docs/users_guide/win32-dlls.xml
38--- ghc-7.2.1-winpaths/docs/users_guide/win32-dlls.xml 2011-09-26 17:58:03.182366314 +0200
39+++ ghc-7.2.1/docs/users_guide/win32-dlls.xml 2011-08-07 19:10:05.000000000 +0200
40@@ -14,7 +14,7 @@
41 Be aware of that <command>ghc</command> and <command>ghci</command> do
42 require filenames containing spaces to be escaped using quotes:
43 <programlisting>
44- c:\ghc\bin\ghci "c:\\Program Files\\Haskell\\Project.hs"
45+ c:\\ghc\\bin\\ghci "c:\\Program Files\\Haskell\\Project.hs"
46 </programlisting>
47 If the quotes are left off in the above command, <command>ghci</command> will
48 interpret the filename as two, "c:\\Program" and "Files\\Haskell\\Project.hs".
49@@ -134,13 +134,13 @@
50 unix-style API on top of the windows libraries, to facilitate ports of
51 unix software to windows. To this end, they introduce a unix-style
52 directory hierarchy under some root directory (typically
53-<filename>/</filename> is <filename>C:\cygwin\</filename>). Moreover,
54+<filename>/</filename> is <filename>C:\\cygwin\\</filename>). Moreover,
55 everything built against the cygwin API (including the cygwin tools
56 and programs compiled with cygwin's ghc) will see / as the root of
57 their file system, happily pretending to work in a typical unix
58 environment, and finding things like <filename>/bin</filename> and <filename>/usr/include</filename> without
59 ever explicitly bothering with their actual location on the windows
60-system (probably <filename>C:\cygwin\bin</filename> and <filename>C:\cygwin\usr\include</filename>).
61+system (probably <filename>C:\\cygwin\\bin</filename> and <filename>C:\\cygwin\\usr\\include</filename>).
62 </para>
63 </sect2>
64
This page took 0.111059 seconds and 4 git commands to generate.