diff options
| author | hallgren <hallgren@chalmers.se> | 2014-06-21 12:26:56 +0000 |
|---|---|---|
| committer | hallgren <hallgren@chalmers.se> | 2014-06-21 12:26:56 +0000 |
| commit | 58156369fac13076ea41ad9e99931512d89ce906 (patch) | |
| tree | 799e365dda83c5769ff3e96abc9763457a421304 /WebSetup.hs | |
| parent | fc4c8b0058e425baf4e2b516256f96ed900de29c (diff) | |
The --output-dir option now applies also to PGF files
Diffstat (limited to 'WebSetup.hs')
| -rw-r--r-- | WebSetup.hs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/WebSetup.hs b/WebSetup.hs index 51c63554b..d3d72b607 100644 --- a/WebSetup.hs +++ b/WebSetup.hs @@ -48,7 +48,7 @@ buildWeb gf args flags pkg lbi = dir = "examples"</>subdir cmd = gf++" -make -s -optimize-pgf --gfo-dir="++tmp_dir++ " --gf-lib-path="++buildDir lbi </> "rgl"++ - -- " --output-dir="++tmp_dir++ -- has no effect?! + " --output-dir="++gfo_dir++ " "++unwords [dir</>file|file<-src] installWeb gf args flags pki lbi = setupWeb gf args dest pki lbi @@ -70,11 +70,12 @@ setupWeb gf args dest pkg lbi = cloud_dir = www_dir </> "tmp" -- hmm logo_dir = www_dir </> "Logos" www_dir = datadir (absoluteInstallDirs pkg lbi dest) </> "www" + gfo_dir = buildDir lbi </> "examples" copy_pgf (pgf,subdir,_) = do let dst = grammars_dir</>pgf putStrLn $ "Installing "++dst - copyFile pgf dst + copyFile (gfo_dir</>pgf) dst gf_logo = "gf0.png" |