diff --git a/Main.hs b/Main.hs index db8cbec..6f7c3bc 100644 --- a/Main.hs +++ b/Main.hs @@ -74,6 +74,7 @@ optionsNoWarnings = , Option [] ["run-indent"] (NoArg $ optRunIndent) "run indent on source before compilation (will full mode)" , Option [] ["frontend"] (ReqArg optFrontend "FRONTEND") "language frontend (options: occam, rain)" , Option [] ["include-path"] (NoArg $ optPrintPath tockIncludeDir) "print include path" + , Option [] ["lib-path"] (NoArg $ optPrintPath tockLibDir) "print lib path" , Option [] ["mode"] (ReqArg optMode "MODE") "select mode (options: flowgraph, lex, html, parse, compile, post-c, full)" , Option [] ["module-path"] (NoArg $ optPrintPath tockModuleDir) "print module path" , Option ['c'] ["no-main"] (NoArg optNoMain) "file has no main process; do not link either" diff --git a/Makefile.am b/Makefile.am index 3da45a5..8a27ad1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -96,14 +96,17 @@ endif TOCKDIR=$(DATADIR)/tock TOCKMODDIR=$(TOCKDIR)/modules TOCKINCDIR=$(TOCKDIR)/include +TOCKLIBDIR=$(TOCKDIR)/lib modulesdir=$(TOCKMODDIR) tockincdir=$(TOCKINCDIR) +tocklibdir=$(TOCKLIBDIR) config/Paths.hs: config/Paths.hs.in @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 + | sed -e 's,@@tockincdir@@,$(TOCKINCDIR),g' \ + | sed -e 's,@@tocklibdir@@,$(TOCKLIBDIR),g' >config/Paths.hs data/NavAST.hs: GenNavAST$(EXEEXT) ./GenNavAST$(EXEEXT) > data/NavAST.hs diff --git a/config/Paths.hs.in b/config/Paths.hs.in index ae03412..09cfe47 100644 --- a/config/Paths.hs.in +++ b/config/Paths.hs.in @@ -15,3 +15,6 @@ tockModuleDir = "@@tockmoddir@@" tockIncludeDir :: String tockIncludeDir = "@@tockincdir@@" + +tockLibDir :: String +tockLibDir = "@@tocklibdir@@"