summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHerbert Valerio Riedel <hvr@gnu.org>2014-03-20 09:20:06 +0100
committerHerbert Valerio Riedel <hvr@gnu.org>2014-03-23 10:47:09 +0100
commit34b072177b687c8fcc24f87293beae0752e82d32 (patch)
tree8733681b18acd98669db6ef12e570a16a02dd4c2
parent045b28033a33a48d31951240a8cb35f2b78345dc (diff)
downloadhaskell-34b072177b687c8fcc24f87293beae0752e82d32.tar.gz
Convert haddock into a proper submodule (re #8545)
This should help contribute content to https://ghc.haskell.org/trac/ghc/wiki/WorkingConventions/Git/Submodules Signed-off-by: Herbert Valerio Riedel <hvr@gnu.org>
-rw-r--r--.gitignore1
-rw-r--r--.gitmodules3
-rw-r--r--packages2
m---------utils/haddock0
4 files changed, 4 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore
index 93feea3ec2..e60382bd1b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -71,7 +71,6 @@ _darcs/
/libraries/unix/
/libraries/utf8-string/
/nofib/
-/utils/haddock/
/utils/hsc2hs/
# -----------------------------------------------------------------------------
diff --git a/.gitmodules b/.gitmodules
index d83bfd05e9..99893a4ab9 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -54,3 +54,6 @@
path = libraries/random
url = ../packages/random.git
ignore = untracked
+[submodule "utils/haddock"]
+ path = utils/haddock
+ url = ../haddock.git
diff --git a/packages b/packages
index 616dfc1d89..2683c992c6 100644
--- a/packages
+++ b/packages
@@ -47,7 +47,7 @@
ghc-tarballs windows ghc-tarballs.git -
libffi-tarballs - libffi-tarballs.git -
utils/hsc2hs - hsc2hs.git -
-utils/haddock - haddock.git -
+utils/haddock - - -
libraries/array - packages/array.git -
libraries/base - packages/base.git -
libraries/binary - - https://github.com/kolmodin/binary.git
diff --git a/utils/haddock b/utils/haddock
new file mode 160000
+Subproject 725faca5ee670f80359321adc112408880e9c07