Move the HTML documentation into the doc/html directory.

diff --git a/doc/.gitignore b/doc/html/.gitignore
similarity index 100%
rename from doc/.gitignore
rename to doc/html/.gitignore

diff --git a/makefile b/makefile
index dd568009a096c934169f861d0be3664004273048..7bbd4672c3c2f31012b099f5fdb2d76f279ea8d3 100644 (file)
--- a/makefile
+++ b/makefile
@@ -27,7 +27,7 @@ clean:
        rm -f src/Tests/*.hi
        rm -f src/Tests/*.o
        rm -f *.prof
-       rm -rf doc/*
+       rm -rf doc/html/*
 
 test:
        runghc -i"src" test/TestSuite.hs
@@ -43,7 +43,7 @@ DOCS += -i /usr/share/doc/hmatrix-0.10.0.1/html/hmatrix.haddock
 
 doc: src_html
        haddock $(DOCS) --html --use-unicode               \
-         --odir=doc/ --title="spline3"                    \
+         --odir=doc/html/ --title="spline3"               \
          --source-module="src/%{MODULE/.//}.html"         \
          --source-entity="src/%{MODULE/.//}.html#%{NAME}" \
          src/*.hs src/Tests/*.hs

diff --git a/util/hscolour_srcs b/util/hscolour_srcs
index 8bc595fd349002256e3650fccfd7d6046af2c170..d5c015cc6ec922e073552324a876ba5f434ce465 100755 (executable)
--- a/util/hscolour_srcs
+++ b/util/hscolour_srcs
@@ -12,11 +12,11 @@
 SRCS=`find ./src -iname '*.hs'`
 
 # We have to create the output directories before we start.
-mkdir -p doc/src/Tests
+mkdir -p doc/html/src/Tests
 
 for file in $SRCS; do
     DIRNAME=`dirname $file`
     BASENAME=`basename $file .hs`
-    OUTFILE="doc/${DIRNAME}/${BASENAME}.html"
+    OUTFILE="doc/html/${DIRNAME}/${BASENAME}.html"
     HsColour -html -anchor $file > $OUTFILE
 done