summaryrefslogtreecommitdiff
path: root/doc/install
diff options
context:
space:
mode:
Diffstat (limited to 'doc/install')
-rw-r--r--doc/install/Fedora.mdwn11
-rw-r--r--doc/install/OSX/comment_2_25552ff2942048fafe97d653757f1ad6._comment7
-rw-r--r--doc/install/OSX/old_comments.mdwn1
-rw-r--r--doc/install/OSX/old_comments/comment_10_798000aab19af2944b6e44dbc550c6fe._comment (renamed from doc/install/OSX/comment_10_798000aab19af2944b6e44dbc550c6fe._comment)0
-rw-r--r--doc/install/OSX/old_comments/comment_11_707a1a27a15b2de8dfc8d1a30420ab4c._comment (renamed from doc/install/OSX/comment_11_707a1a27a15b2de8dfc8d1a30420ab4c._comment)0
-rw-r--r--doc/install/OSX/old_comments/comment_12_60d13f2c8e008af1041bea565a392c83._comment (renamed from doc/install/OSX/comment_12_60d13f2c8e008af1041bea565a392c83._comment)0
-rw-r--r--doc/install/OSX/old_comments/comment_13_a6f48c87c2d6eabe379d6e10a6cac453._comment (renamed from doc/install/OSX/comment_13_a6f48c87c2d6eabe379d6e10a6cac453._comment)0
-rw-r--r--doc/install/OSX/old_comments/comment_14_6ef2ddb7b11ce6ad54578ae118ed346e._comment (renamed from doc/install/OSX/comment_14_6ef2ddb7b11ce6ad54578ae118ed346e._comment)0
-rw-r--r--doc/install/OSX/old_comments/comment_15_6fd1fad5b6d9f36620e5a0e99edd2f89._comment (renamed from doc/install/OSX/comment_15_6fd1fad5b6d9f36620e5a0e99edd2f89._comment)0
-rw-r--r--doc/install/OSX/old_comments/comment_16_af6fe3540032cdf4400478de87771058._comment30
-rw-r--r--doc/install/OSX/old_comments/comment_17_8d3a0596db67108041728b20f2790f31._comment7
-rw-r--r--doc/install/OSX/old_comments/comment_2_0327c64b15249596add635d26f4ce67f._comment (renamed from doc/install/OSX/comment_2_0327c64b15249596add635d26f4ce67f._comment)0
-rw-r--r--doc/install/OSX/old_comments/comment_3_47c682a779812dda77601c24a619923c._comment (renamed from doc/install/OSX/comment_3_47c682a779812dda77601c24a619923c._comment)0
-rw-r--r--doc/install/OSX/old_comments/comment_4_e6109a964064a2a799768a370e57801d._comment (renamed from doc/install/OSX/comment_4_e6109a964064a2a799768a370e57801d._comment)0
-rw-r--r--doc/install/OSX/old_comments/comment_5_50777853f808d57b957f8ce9a0f84b3d._comment (renamed from doc/install/OSX/comment_5_50777853f808d57b957f8ce9a0f84b3d._comment)0
-rw-r--r--doc/install/OSX/old_comments/comment_6_18a8df794aa0ddd294dbf17d3d4c7fe2._comment (renamed from doc/install/OSX/comment_6_18a8df794aa0ddd294dbf17d3d4c7fe2._comment)0
-rw-r--r--doc/install/OSX/old_comments/comment_7_2ce7acab15403d3f993cec94ec7f3bc6._comment (renamed from doc/install/OSX/comment_7_2ce7acab15403d3f993cec94ec7f3bc6._comment)0
-rw-r--r--doc/install/OSX/old_comments/comment_8_a93ad4b67c5df4243268bcf32562f6be._comment (renamed from doc/install/OSX/comment_8_a93ad4b67c5df4243268bcf32562f6be._comment)0
-rw-r--r--doc/install/OSX/old_comments/comment_9_ae3ed5345bc84f57e44251d2e6c39342._comment (renamed from doc/install/OSX/comment_9_ae3ed5345bc84f57e44251d2e6c39342._comment)0
19 files changed, 52 insertions, 4 deletions
diff --git a/doc/install/Fedora.mdwn b/doc/install/Fedora.mdwn
index 73e9f9a5d..c1905e01b 100644
--- a/doc/install/Fedora.mdwn
+++ b/doc/install/Fedora.mdwn
@@ -1,4 +1,10 @@
-Installation recipe for Fedora 14 thruough 17.
+git-annex is recently finding its way into Fedora.
+
+* [Status of getting a Fedora package](https://bugzilla.redhat.com/show_bug.cgi?id=662259)
+* [Koji build for F17](http://koji.fedoraproject.org/koji/buildinfo?buildID=328654)
+* [Koji build for F16](http://koji.fedoraproject.org/koji/buildinfo?buildID=328656)
+
+Installation recipe for Fedora 14 thruough 15.
<pre>
sudo yum install ghc cabal-install pcre-devel
@@ -15,6 +21,3 @@ cabal install --bindir=$HOME/bin
Note: You can't just use `cabal install git-annex`, because Fedora does
not yet ship ghc 7.4.
-* [Status of getting a Fedora package](https://bugzilla.redhat.com/show_bug.cgi?id=662259)a
-* [Koji build for F17](http://koji.fedoraproject.org/koji/buildinfo?buildID=328654)
-* [Koji build for F16](http://koji.fedoraproject.org/koji/buildinfo?buildID=328656)
diff --git a/doc/install/OSX/comment_2_25552ff2942048fafe97d653757f1ad6._comment b/doc/install/OSX/comment_2_25552ff2942048fafe97d653757f1ad6._comment
new file mode 100644
index 000000000..62ee10910
--- /dev/null
+++ b/doc/install/OSX/comment_2_25552ff2942048fafe97d653757f1ad6._comment
@@ -0,0 +1,7 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ subject="comment 2"
+ date="2012-07-24T15:09:29Z"
+ content="""
+I've moved some outdated comments about installing on OSX to [[old_comments]].
+"""]]
diff --git a/doc/install/OSX/old_comments.mdwn b/doc/install/OSX/old_comments.mdwn
new file mode 100644
index 000000000..ccb6785fd
--- /dev/null
+++ b/doc/install/OSX/old_comments.mdwn
@@ -0,0 +1 @@
+Moved a bunch of outdated comments here, AFAIK all these issues are fixed.
diff --git a/doc/install/OSX/comment_10_798000aab19af2944b6e44dbc550c6fe._comment b/doc/install/OSX/old_comments/comment_10_798000aab19af2944b6e44dbc550c6fe._comment
index 675a90eee..675a90eee 100644
--- a/doc/install/OSX/comment_10_798000aab19af2944b6e44dbc550c6fe._comment
+++ b/doc/install/OSX/old_comments/comment_10_798000aab19af2944b6e44dbc550c6fe._comment
diff --git a/doc/install/OSX/comment_11_707a1a27a15b2de8dfc8d1a30420ab4c._comment b/doc/install/OSX/old_comments/comment_11_707a1a27a15b2de8dfc8d1a30420ab4c._comment
index 69a4f9128..69a4f9128 100644
--- a/doc/install/OSX/comment_11_707a1a27a15b2de8dfc8d1a30420ab4c._comment
+++ b/doc/install/OSX/old_comments/comment_11_707a1a27a15b2de8dfc8d1a30420ab4c._comment
diff --git a/doc/install/OSX/comment_12_60d13f2c8e008af1041bea565a392c83._comment b/doc/install/OSX/old_comments/comment_12_60d13f2c8e008af1041bea565a392c83._comment
index e2e85aaa9..e2e85aaa9 100644
--- a/doc/install/OSX/comment_12_60d13f2c8e008af1041bea565a392c83._comment
+++ b/doc/install/OSX/old_comments/comment_12_60d13f2c8e008af1041bea565a392c83._comment
diff --git a/doc/install/OSX/comment_13_a6f48c87c2d6eabe379d6e10a6cac453._comment b/doc/install/OSX/old_comments/comment_13_a6f48c87c2d6eabe379d6e10a6cac453._comment
index e5ce62b13..e5ce62b13 100644
--- a/doc/install/OSX/comment_13_a6f48c87c2d6eabe379d6e10a6cac453._comment
+++ b/doc/install/OSX/old_comments/comment_13_a6f48c87c2d6eabe379d6e10a6cac453._comment
diff --git a/doc/install/OSX/comment_14_6ef2ddb7b11ce6ad54578ae118ed346e._comment b/doc/install/OSX/old_comments/comment_14_6ef2ddb7b11ce6ad54578ae118ed346e._comment
index 35e0bb6ed..35e0bb6ed 100644
--- a/doc/install/OSX/comment_14_6ef2ddb7b11ce6ad54578ae118ed346e._comment
+++ b/doc/install/OSX/old_comments/comment_14_6ef2ddb7b11ce6ad54578ae118ed346e._comment
diff --git a/doc/install/OSX/comment_15_6fd1fad5b6d9f36620e5a0e99edd2f89._comment b/doc/install/OSX/old_comments/comment_15_6fd1fad5b6d9f36620e5a0e99edd2f89._comment
index 0005328c4..0005328c4 100644
--- a/doc/install/OSX/comment_15_6fd1fad5b6d9f36620e5a0e99edd2f89._comment
+++ b/doc/install/OSX/old_comments/comment_15_6fd1fad5b6d9f36620e5a0e99edd2f89._comment
diff --git a/doc/install/OSX/old_comments/comment_16_af6fe3540032cdf4400478de87771058._comment b/doc/install/OSX/old_comments/comment_16_af6fe3540032cdf4400478de87771058._comment
new file mode 100644
index 000000000..5da4b22c6
--- /dev/null
+++ b/doc/install/OSX/old_comments/comment_16_af6fe3540032cdf4400478de87771058._comment
@@ -0,0 +1,30 @@
+[[!comment format=mdwn
+ username="https://a-or-b.myopenid.com/"
+ ip="203.45.2.230"
+ subject="Compiling git-annex on OSX (with 32 bit Haskell)"
+ date="2012-07-24T03:26:45Z"
+ content="""
+I came across an issue when following the instructions here:
+ <http://git-annex.branchable.com/install/OSX/>
+
+I'm compiling the 'assistant' branch (522f568450a005ae81b24f63bb37e75320b51219).
+
+
+The pre-compiled version of Haskell for OSX recommends the 32 bit installer, however git-annex compiles
+
+> Utility/libdiskfree.o Utility/libkqueue.o Utility/libmounts.o
+
+as 64 bit. The 'make' command fails on linking 32- and 64-bit code.
+
+So... I made a small change to the Makefile
+
+> CFLAGS=-Wall
+
+becomes
+
+> CFLAGS=-Wall -m32
+
+I don't know if there is an easy way to programmatically check for this, or even if you'd want to spend time doing it, but it might help someone else out.
+
+<https://gist.github.com/3167798>
+"""]]
diff --git a/doc/install/OSX/old_comments/comment_17_8d3a0596db67108041728b20f2790f31._comment b/doc/install/OSX/old_comments/comment_17_8d3a0596db67108041728b20f2790f31._comment
new file mode 100644
index 000000000..782f2fd75
--- /dev/null
+++ b/doc/install/OSX/old_comments/comment_17_8d3a0596db67108041728b20f2790f31._comment
@@ -0,0 +1,7 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ subject="comment 17"
+ date="2012-07-24T15:03:49Z"
+ content="""
+The instructions say to use cabal for a reason -- it's more likely to work. But I have made the Makefile detect the mismatched GHC and C compiler and force the C compiler to 32 bit.
+"""]]
diff --git a/doc/install/OSX/comment_2_0327c64b15249596add635d26f4ce67f._comment b/doc/install/OSX/old_comments/comment_2_0327c64b15249596add635d26f4ce67f._comment
index 5768d8b93..5768d8b93 100644
--- a/doc/install/OSX/comment_2_0327c64b15249596add635d26f4ce67f._comment
+++ b/doc/install/OSX/old_comments/comment_2_0327c64b15249596add635d26f4ce67f._comment
diff --git a/doc/install/OSX/comment_3_47c682a779812dda77601c24a619923c._comment b/doc/install/OSX/old_comments/comment_3_47c682a779812dda77601c24a619923c._comment
index 251375cbe..251375cbe 100644
--- a/doc/install/OSX/comment_3_47c682a779812dda77601c24a619923c._comment
+++ b/doc/install/OSX/old_comments/comment_3_47c682a779812dda77601c24a619923c._comment
diff --git a/doc/install/OSX/comment_4_e6109a964064a2a799768a370e57801d._comment b/doc/install/OSX/old_comments/comment_4_e6109a964064a2a799768a370e57801d._comment
index be3ba2be4..be3ba2be4 100644
--- a/doc/install/OSX/comment_4_e6109a964064a2a799768a370e57801d._comment
+++ b/doc/install/OSX/old_comments/comment_4_e6109a964064a2a799768a370e57801d._comment
diff --git a/doc/install/OSX/comment_5_50777853f808d57b957f8ce9a0f84b3d._comment b/doc/install/OSX/old_comments/comment_5_50777853f808d57b957f8ce9a0f84b3d._comment
index eca176178..eca176178 100644
--- a/doc/install/OSX/comment_5_50777853f808d57b957f8ce9a0f84b3d._comment
+++ b/doc/install/OSX/old_comments/comment_5_50777853f808d57b957f8ce9a0f84b3d._comment
diff --git a/doc/install/OSX/comment_6_18a8df794aa0ddd294dbf17d3d4c7fe2._comment b/doc/install/OSX/old_comments/comment_6_18a8df794aa0ddd294dbf17d3d4c7fe2._comment
index 5cb813776..5cb813776 100644
--- a/doc/install/OSX/comment_6_18a8df794aa0ddd294dbf17d3d4c7fe2._comment
+++ b/doc/install/OSX/old_comments/comment_6_18a8df794aa0ddd294dbf17d3d4c7fe2._comment
diff --git a/doc/install/OSX/comment_7_2ce7acab15403d3f993cec94ec7f3bc6._comment b/doc/install/OSX/old_comments/comment_7_2ce7acab15403d3f993cec94ec7f3bc6._comment
index 32093ee51..32093ee51 100644
--- a/doc/install/OSX/comment_7_2ce7acab15403d3f993cec94ec7f3bc6._comment
+++ b/doc/install/OSX/old_comments/comment_7_2ce7acab15403d3f993cec94ec7f3bc6._comment
diff --git a/doc/install/OSX/comment_8_a93ad4b67c5df4243268bcf32562f6be._comment b/doc/install/OSX/old_comments/comment_8_a93ad4b67c5df4243268bcf32562f6be._comment
index cd128a6f1..cd128a6f1 100644
--- a/doc/install/OSX/comment_8_a93ad4b67c5df4243268bcf32562f6be._comment
+++ b/doc/install/OSX/old_comments/comment_8_a93ad4b67c5df4243268bcf32562f6be._comment
diff --git a/doc/install/OSX/comment_9_ae3ed5345bc84f57e44251d2e6c39342._comment b/doc/install/OSX/old_comments/comment_9_ae3ed5345bc84f57e44251d2e6c39342._comment
index 70fbc6c3c..70fbc6c3c 100644
--- a/doc/install/OSX/comment_9_ae3ed5345bc84f57e44251d2e6c39342._comment
+++ b/doc/install/OSX/old_comments/comment_9_ae3ed5345bc84f57e44251d2e6c39342._comment