From 9d581b1d5e506163f797950ba07db63192400ae4 Mon Sep 17 00:00:00 2001 From: "John J. Camilleri" Date: Fri, 10 Aug 2018 08:31:02 +0200 Subject: [PATCH 1/3] Fix note in README about default command --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index acca5ba7d..4cd0b2449 100644 --- a/README.md +++ b/README.md @@ -79,11 +79,12 @@ clean - `CMDS` is one or more of: `prelude`, -`all` (default), +`all`, `lang`, `api`, `compat`, or an explicit module name (e.g. `ExtraEng.gf`. You don't need to specify to language subdirectory, but there is a restriction that the module must exist in a **direct** subdirectory of `src`). +If ommitted, the default command is `prelude all`. - `MODE` is one of: `present`, `alltenses` From 0fe46a6d17bf608548b8b4fe612e929eb96d9a5b Mon Sep 17 00:00:00 2001 From: "John J. Camilleri" Date: Fri, 10 Aug 2018 08:33:01 +0200 Subject: [PATCH 2/3] Change shebang to /bin/bash --- Make.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Make.sh b/Make.sh index 30a8bfc8a..fc66ffcda 100755 --- a/Make.sh +++ b/Make.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # --- # Non-Haskell RGL build script for Unix-based machines From 989c6f5893c56d78e51d3eb22619cbdc7b425fde Mon Sep 17 00:00:00 2001 From: "John J. Camilleri" Date: Fri, 10 Aug 2018 18:27:19 +0200 Subject: [PATCH 3/3] Add dist to --gf-lib-path in Make.sh Otherwise an externally set GF_LIB_PATH will mess it up Might also need to make same change in Make.hs --- Make.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Make.sh b/Make.sh index fc66ffcda..97870d31d 100755 --- a/Make.sh +++ b/Make.sh @@ -53,7 +53,7 @@ fi # A few more definitions before we get started src="src" dist="dist" -gfc="${gf} --batch --quiet" +gfc="${gf} --batch --quiet --gf-lib-path=${dist}" # Make directories if not present mkdir -p "${dist}/prelude"