[commit: ghc] master: Convert haddock into a proper submodule (re #8545) (34b0721)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/34b072177b687c8fcc24f87293beae0752e82d32/ghc

>---------------------------------------------------------------

commit 34b072177b687c8fcc24f87293beae0752e82d32
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Thu Mar 20 09:20:06 2014 +0100

    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 at gnu.org>


>---------------------------------------------------------------

34b072177b687c8fcc24f87293beae0752e82d32
 .gitignore    |    1 -
 .gitmodules   |    3 +++
 packages      |    2 +-
 utils/haddock |    1 +
 4 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 93feea3..e60382b 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 d83bfd0..99893a4 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 616dfc1..2683c99 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
index 0000000..725faca
--- /dev/null
+++ b/utils/haddock
@@ -0,0 +1 @@
+Subproject commit 725faca5ee670f80359321adc112408880e9c073