From c0becec2bd70d8dfb45554f9928c4cba7bc3109e Mon Sep 17 00:00:00 2001 From: hallgren Date: Fri, 14 Oct 2011 19:34:55 +0000 Subject: Bug fix in setup for gf -server mode Use the command "dist/build/gf/gf" instead of "gf" to compile the sample grammars for the minibar, to avoid failing if gf is installed in a directory which is not in the $PATH. --- WebSetup.hs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'WebSetup.hs') diff --git a/WebSetup.hs b/WebSetup.hs index c0ac0a66c..3deba51ea 100644 --- a/WebSetup.hs +++ b/WebSetup.hs @@ -21,17 +21,17 @@ example_grammars = -- :: [(pgf, tmp, src)] ("Letter.pgf","letter","examples""letter""Letter???.gf")] -installWeb args flags pki lbi = setupWeb args dest pki lbi +installWeb gf args flags pki lbi = setupWeb gf args dest pki lbi where dest = NoCopyDest -copyWeb args flags pki lbi = setupWeb args dest pki lbi +copyWeb gf args flags pki lbi = setupWeb gf args dest pki lbi where dest = case copyDest flags of NoFlag -> NoCopyDest Flag d -> d -setupWeb args dest pkg lbi = +setupWeb gf args dest pkg lbi = do putStrLn "setupWeb" mapM_ (createDirectoryIfMissing True) [grammars_dir,cloud_dir] mapM_ build_pgf example_grammars @@ -49,7 +49,7 @@ setupWeb args dest pkg lbi = removeFile pgf where tmp_dir = gfo_dirtmp - cmd = "gf -make -s -optimize-pgf --gfo-dir="++tmp_dir++ + cmd = gf++" -make -s -optimize-pgf --gfo-dir="++tmp_dir++ -- " --output-dir="++grammars_dir++ -- has no effect?! " "++src -- cgit v1.2.3