Do away with the pkgconfig file in favour of another generated module.

Paths.hs is now generated by the Makefile.am, so it can include paths.

As a bonus, this actually works, since we weren't previously installing the .pc
file anywhere...

Makefile.am

@@ -76,7 +76,12 @@ data/TagAST.hs: GenTagAST$(EXEEXT)
 data/OrdAST.hs: GenOrdAST$(EXEEXT)
 	./GenOrdAST$(EXEEXT) > data/OrdAST.hs
 
+config/Paths.hs: config/Paths.hs.in
+	@sed -e 's,@@pkgincludedir@@,$(pkgincludedir),g' \
+		config/Paths.hs.in >config/Paths.hs
+
 config_sources = config/CompilerCommands.hs
+config_sources += config/Paths.hs
 config_sources += config/TypeSizes.hs
 
 BUILT_SOURCES = data/OrdAST.hs

config/CompilerCommands.hs.in

@@ -3,12 +3,10 @@ module CompilerCommands where
 
 import Data.List
 
--- Because we can't know for sure yet where Tock will be installed,
+import Paths
--- we must include this pkg-config call to be executed each time
+
--- to find out where our headers live.  Suggestions for a better way
--- are welcome.
 tockIncludeFlags :: String
-tockIncludeFlags = "`pkg-config --cflags tock-1.0`"
+tockIncludeFlags = "-I" ++ pkgIncludeDir
 
 cCommand :: String -> String -> String
 cCommand inp out = "@CC@ @TOCK_CFLAGS@ " ++ tockIncludeFlags ++ " -c -o " ++ out ++ " " ++ inp

config/Paths.hs.in

@@ -0,0 +1,8 @@
+-- | Installation path information for Tock.
+-- This module is auto-generated by Makefile.am from Paths.hs.in.
+-- (It can't be generated by autoconf, because you can't expand paths in a
+-- configure script.)
+module Paths where
+
+pkgIncludeDir :: String
+pkgIncludeDir = "@@pkgincludedir@@"

configure.ac

@@ -169,5 +169,5 @@ AC_SUBST(ccsp_available)
 AC_SUBST(cppcsp_available)
 AC_SUBST(MKDIR_P)
 
-AC_CONFIG_FILES([Makefile config/TypeSizes.hs config/CompilerCommands.hs tock-1.0.pc])
+AC_CONFIG_FILES([Makefile config/TypeSizes.hs config/CompilerCommands.hs])
 AC_OUTPUT

tock-1.0.pc.in

@@ -1,15 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-pkgincludedir=${includedir}/@PACKAGE@
-
-Name: Tock
-Description: A compiler for concurrent languages
-Requires:
-Version: @VERSION@
-Libs: 
-Cflags: -I${pkgincludedir}
-URL: https://www.cs.kent.ac.uk/research/groups/sys/wiki/Tock
-
-