Changed the build process to support a directory to put modules and includes in, and added a dummy lib (occamutl)

Makefile.am

@@ -93,9 +93,17 @@ else
 	mv frontends/LexRain.temphs frontends/LexRain.hs
 endif
 
+TOCKDIR=$(DATADIR)/tock
+TOCKMODDIR=$(TOCKDIR)/modules
+TOCKINCDIR=$(TOCKDIR)/include
+modulesdir=$(TOCKMODDIR)
+tockincdir=$(TOCKINCDIR)
+
 config/Paths.hs: config/Paths.hs.in
-	@sed -e 's,@@pkgincludedir@@,$(pkgincludedir),g' \
-		config/Paths.hs.in >config/Paths.hs
+	@sed -e 's,@@pkgincludedir@@,$(pkgincludedir),g' config/Paths.hs.in \
+	  | sed -e 's,@@tockdir@@,$(TOCKDIR),g' \
+	  | sed -e 's,@@tockmoddir@@,$(TOCKMODDIR),g' \
+	  | sed -e 's,@@tockincdir@@,$(TOCKINCDIR),g' >config/Paths.hs
 
 data/NavAST.hs: GenNavAST$(EXEEXT)
 	./GenNavAST$(EXEEXT) > data/NavAST.hs
@@ -116,6 +124,11 @@ BUILT_SOURCES += data/TagAST.hs
 BUILT_SOURCES += frontends/LexOccam.hs
 BUILT_SOURCES += frontends/LexRain.hs
 
+# For dummy modules:
+modules_DATA = 
+# For dummy lib files:
+tockinc_DATA = occamutl.tock.inc occamutl.tock.h
+
 CLEANFILES = $(BUILT_SOURCES) $(config_sources)
 
 EXTRA_DIST = docextra testcases/automatic

config/Paths.hs.in

@@ -6,3 +6,12 @@ module Paths where
 
 pkgIncludeDir :: String
 pkgIncludeDir = "@@pkgincludedir@@"
+
+tockDir :: String
+tockDir = "@@tockdir@@"
+
+tockModuleDir :: String
+tockModuleDir = "@@tockmoddir@@"
+
+tockIncludeDir :: String
+tockIncludeDir = "@@tockincdir@@"

configure.ac

@@ -261,6 +261,9 @@ TOCK_CLDFLAGS="$LDFLAGS $CCSP_LIBS $GLIB_LIBS -lm"
 TOCK_CXXFLAGS="$CPPFLAGS $CXXFLAGS $common_cflags $CPPCSP2_CFLAGS"
 TOCK_CXXLDFLAGS="$LDFLAGS $CPPCSP2_LIBS -lm"
 
+DATADIR=$datadir
+AC_SUBST(DATADIR)
+
 AC_SUBST(TOCK_CFLAGS)
 AC_SUBST(TOCK_CLDFLAGS)
 AC_SUBST(TOCK_CXXFLAGS)