Some tweaks to 605fb33.

Author: dhil

Makefile

@@ -90,9 +90,9 @@ create-startup-script:
 	@# This path resolution scheme may depend on BASH semantics.
 	$(eval ABS_BUILD_DIR=$(shell cd $(BUILD_DIR) ; pwd -P))
 	@# This is an attempt to put in a safe guard
-	@# If the above resolution fails to yield an existent path then fall back to the relative path in BUILD_DIR.
+	@# If the above resolution fails to yield an existing path then fall back to the relative path in BUILD_DIR.
 	$(eval ABS_BUILD_DIR:=$(shell test -d $(ABS_BUILD_DIR) && echo "$(ABS_BUILD_DIR)" || echo "$(BUILD_DIR)"))
-	@echo "LINKS_LIB=\"$(ABS_BUILD_DIR)/default/lib\" $(ABS_BUILD_DIR)/default/bin/links.exe \"\$$@\"" >> links
+	@echo "$(ABS_BUILD_DIR)/default/bin/links.exe \"\$$@\"" >> links
 	@chmod +x links
 	ln -fs links linx
 
@@ -123,6 +123,11 @@ build-release-all: dune dune-project include-db-sources
 include-db-sources:
 	$(eval SOURCES:=$(SOURCES),$(DB_SOURCES))
 
+# Auxiliary rule used by `opam install` to build Links
+.PHONY: opam-build-links.opam
+opam-build-links.opam: links.opam
+	$(shell LINKS_BUILT_BY_OPAM=1 dune build -p links)
+
 # Runs the test suite. We reset the variables CAMLRUNPARAM and
 # OCAMLRUNPARAM, because some of the tests are sensitive to the
 # printing of stack traces.
@@ -176,8 +181,3 @@ opam-release:
 	dune-release publish -p $(RELEASE_PKGS) distrib
 	dune-release opam -p $(RELEASE_PKGS) pkg
 	dune-release opam -p $(RELEASE_PKGS) submit
-
-# Build Links
-.PHONY: opam-build-links.opam
-opam-build-links.opam: links.opam
-	$(shell LINKS_BUILT_BY_OPAM=1 dune build -p links)

core/dune

@@ -20,9 +20,11 @@
              findlib menhirLib links.lens calendar)
   (preprocess (pps ppx_deriving.std ppx_deriving_yojson)))
 
+
+;; Generate the Linkspath module.
 (rule
   (targets linkspath.ml)
-  (deps (:gen ../gen_linkspath/gen_linkspath.exe))
+  (deps (:gen ../linkspath/gen_linkspath.exe))
   (action (run %{gen} -o %{targets})))
 
 ;; Make Query modules available.

links.opam

@@ -7,12 +7,11 @@ homepage: "https://github.com/links-lang/links"
 dev-repo: "git+https://github.com/links-lang/links.git"
 bug-reports: "https://github.com/links-lang/links/issues"
 license: "GPL-3.0-only"
-version: "0.9.7"
 
 
 build: [
-  ["dune" "exec" "preinstall/preinstall.exe" "--" "-libdir" _:lib]
-  [make "opam-build-links.opam"]
+  [ "dune" "exec" "preinstall/preinstall.exe" "--" "-libdir" _:lib ]
+  [ make "opam-build-links.opam" ]
 ]
 
 depends: [

gen_linkspath/dune linkspath/dunegen_linkspath/dune renamed to linkspath/dune

@@ -1,13 +1,27 @@
+(** This module builds another ML module, which contains various
+   computed paths used by the Links runtime. The interface of the
+   generated module is as follows:
+
+   val config : string option (* If `Some fname` then `fname` is the
+                                 absolute filename of the default config file. *)
+
+   val jslib : string         (* Absolute path to the Links JavaScript runtime directory. *)
+   val examples : string      (* Absolute path to the Links examples directory. *)
+   val stdlib : string        (* Absolute path to the Links standard library directory. *)
+   val prelude : string       (* Absolute filename for `prelude.links`. *)
+
+   The generated module is meant for inclusion in Links core.  *)
+
 module C = Configurator.V1
 
 let check_opam =
-  Sys.getenv_opt "LINKS_BUILT_BY_OPAM" |> Option.is_some
+  Option.is_some (Sys.getenv_opt "LINKS_BUILT_BY_OPAM")
 
 let _ =
-  let oc = open_out "linkspath.ml" in 
+  let oc = open_out "linkspath.ml" in
       if check_opam
       then
-        (* If Links is built by OPAM*)
+        (* If Links is built by OPAM *)
         let lib_path = input_line (Unix.open_process_in "opam var lib") in
         let etc_path = input_line (Unix.open_process_in "opam var etc") in
         let share_path = input_line (Unix.open_process_in "opam var share") in
@@ -17,8 +31,8 @@ let _ =
           Printf.fprintf oc "let stdlib = \"%s/links/stdlib\"\n" lib_path;
           Printf.fprintf oc "let prelude = \"%s/links/prelude.links\"\n" lib_path;
           close_out oc
-      else 
-        (* If Links is complied from source*)
+      else
+        (* If Links is complied from source *)
         let git_path =  input_line (Unix.open_process_in "git rev-parse --show-toplevel") in
           Printf.fprintf oc "let config = %s\n" "None";
           Printf.fprintf oc "let jslib = \"%s/lib/js\"\n" git_path;