Skip to content
Browse files

Use cabal directory for prefix

Ignore-this: e199b4a28cffd84641ea21471b18f55c

darcs-hash:20100224143052-228f4-b044d8193b0308003fdf42515c765b2d8a21bcad.gz
  • Loading branch information...
1 parent 79e8c5b commit adc1f0ed5df36c937437f6d0e1c1a5a60ed7441e eb committed Feb 24, 2010
Showing with 11 additions and 8 deletions.
  1. +3 −2 Ivor/Shell.lhs
  2. +8 −6 ivor.cabal
View
5 Ivor/Shell.lhs
@@ -26,13 +26,14 @@
> import Ivor.Equality
> import Ivor.Gadgets
> import Ivor.Primitives
-> import qualified Ivor.Prefix
> import Ivor.Plugin
+> import Paths_ivor
> import System.Exit
> import System.Environment
> import System.Directory
> import System.IO
+> import System.IO.Unsafe
> import Data.Char
> import Debug.Trace
@@ -388,7 +389,7 @@ Special case for importFile. Grr.
> -- | Get the install prefix of the library
> prefix :: FilePath
-> prefix = Ivor.Prefix.prefix
+> prefix = unsafePerformIO getDataDir -- Yes, yes, I know.
If the given file is already loaded, do nothing.
View
14 ivor.cabal
@@ -45,16 +45,17 @@ Data-files: BUGS, INSTALL, TODO, docs/macros.ltx, docs/local.ltx, docs/tt.te
papers/ivor/ivor.tex, papers/ivor/corett.tex, papers/ivor/conclusions.tex,
papers/ivor/intro.tex, papers/ivor/llncs.cls, papers/ivor/tactics.tex,
papers/ivor/library.ltx, papers/ivor/dtp.bib, papers/ivor/alink.bib,
- papers/ivor/Makefile, papers/ivor/embounded.bib
+ papers/ivor/Makefile, papers/ivor/embounded.bib,
+ lib/nat.tt, lib/lt.tt, lib/list.tt, lib/eq.tt,
+ lib/basics.tt, lib/logic.tt, lib/vect.tt, lib/fin.tt
+
Extra-source-files: emacs/ivor-mode.el, examplett/staged.tt, examplett/test.c, examplett/partial.tt, examplett/nat.tt,
examplett/vec.tt, examplett/lt.tt, examplett/Test.hs, examplett/plus.tt,
examplett/jmeq.tt, examplett/eq.tt, examplett/logic.tt, examplett/interp.tt,
examplett/stageplus.tt, examplett/Nat.hs, examplett/general.tt, examplett/natsimpl.tt,
examplett/test.tt, examplett/vect.tt, examplett/fin.tt, examplett/ack.tt,
- IOvor/IOPrims.lhs, IOvor/Main.lhs, IOvor/iobasics.tt, Jones/Main.lhs,
- lib/nat.tt, lib/lt.tt, lib/list.tt, lib/eq.tt,
- lib/basics.tt, lib/logic.tt, lib/vect.tt, lib/fin.tt
+ IOvor/IOPrims.lhs, IOvor/Main.lhs, IOvor/iobasics.tt, Jones/Main.lhs
@@ -77,6 +78,7 @@ Other-modules: Ivor.Nobby, Ivor.TTCore, Ivor.State,
Ivor.CodegenC, Ivor.Datatype, Ivor.Display,
Ivor.ICompile, Ivor.MakeData, Ivor.Unify,
Ivor.Grouper, Ivor.ShellParser, Ivor.Constant,
- Ivor.RunTT, Ivor.Compiler, Ivor.Prefix, Ivor.Errors,
+ Ivor.RunTT, Ivor.Compiler, Ivor.Errors,
Ivor.PatternDefs, Ivor.ShellState, Ivor.Scopecheck,
- Ivor.Overloading
+ Ivor.Overloading,
+ Paths_ivor

0 comments on commit adc1f0e

Please sign in to comment.
Something went wrong with that request. Please try again.