diff --git a/src/Makefile b/src/Makefile
index 1efc4ab85..7e470154e 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -8,7 +8,7 @@ GHCOPTFLAGS=-O2 $(GHCFLAGS)
 GHCFUDFLAG=
 JAVAFLAGS=-target 1.4 -source 1.4
 
-HUGSINCLUDE    =.:for-hugs:api:source:canonical:cf:grammar:infra:shell:useGrammar:compile:newparsing:trace:visualization:
+HUGSINCLUDE    =.:{Hugs}/libraries:for-hugs:api:source:canonical:cf:grammar:infra:shell:useGrammar:compile:newparsing:cfgm:speech:visualization:
 BASICINCLUDE   =-iapi -icompile -igrammar -iinfra -ishell -isource -icanonical -iuseGrammar -icf -inewparsing -iparsers -inotrace -icfgm -ispeech -ivisualization
 GHCINCLUDE     =-ifor-ghc       $(BASICINCLUDE)
 GHCINCLUDENOFUD=-ifor-ghc-nofud $(BASICINCLUDE) 
diff --git a/src/haddock/haddock-script.csh b/src/haddock/haddock-script.csh
index 57248faea..ea1980d8c 100644
--- a/src/haddock/haddock-script.csh
+++ b/src/haddock/haddock-script.csh
@@ -2,8 +2,8 @@
 
 ######################################################################
 # Author: Peter Ljunglöf
-# Time-stamp: "2005-02-03, 16:21"
-# CVS $Date: 2005/02/03 15:23:02 $
+# Time-stamp: "2005-02-04, 10:12"
+# CVS $Date: 2005/02/04 09:46:17 $
 # CVS $Author: peb $
 #
 # a script for producing documentation through Haddock
@@ -19,12 +19,10 @@ set rmfiles = {Lex,Par}{CFG,GF,GFC}.hs
 ######################################################################
 
 echo 0. Creating and cleaning Haddock directory
+echo -- $docdir
 
-if (-d $docdir) then
-    rm $docdir/*
-else
-    mkdir $docdir
-endif
+mkdir -p $docdir
+rm $docdir/*
 
 ######################################################################