From fac264c09f05a8da592c10ebc79a552b6ef33595 Mon Sep 17 00:00:00 2001
From: orbifx <fox@orbitalfox.eu>
Date: Mon, 20 Sep 2021 11:23:52 +0100
Subject: [PATCH] Packaging rules and versioning

---
 Makefile         | 10 ++++++----
 README => ReadMe |  7 ++-----
 cli/convert.ml   |  2 --
 http/http.ml     |  2 --
 4 files changed, 8 insertions(+), 13 deletions(-)
 rename README => ReadMe (89%)

diff --git a/Makefile b/Makefile
index 443d294..205a917 100644
--- a/Makefile
+++ b/Makefile
@@ -8,9 +8,11 @@ clean:
 	dune clean
 
 tgz:
-	cp _build/default/cli/cli.exe logarion
-	strip logarion
-	tar czvf "logarion-$(shell date -r _build/default/src/logarion_cli.exe "+%y-%m-%d")-$(shell uname -s)-$(shell uname -m)-$(shell git rev-parse --short HEAD).tar.gz" share logarion
-	rm logarion
+	dune subst
+	dune build
+	cp _build/default/cli/cli.exe txt
+	strip txt
+	tar czvf "logarion-$(shell date -r _build/default/cli/cli.exe "+%y-%m-%d")-$(shell uname -s)-$(shell uname -m)-$(shell git rev-parse --short HEAD).tar.gz" txt ReadMe
+	rm txt
 
 .PHONY: cli
diff --git a/README b/ReadMe
similarity index 89%
rename from README
rename to ReadMe
index 3f167be..f6f19c0 100644
--- a/README
+++ b/ReadMe
@@ -3,11 +3,13 @@ Logarion is a free and open-source text archive system. A blog-wiki hybrid.
 Download: <https://logarion.orbitalfox.eu/downloads/>
 EUPL licence: <https://joinup.ec.europa.eu/software/page/eupl>
 
+
 Start
 
 Create a folder and run `logarion init` from within it to produce `.logarion/config` configuration file.
 Run `logarion --help` for more options.
 
+
 Community & support
 
 * Website: <https://logarion.orbitalfox.eu>
@@ -15,11 +17,6 @@ Community & support
 * Discussion: <https://lists.orbitalfox.eu/listinfo/logarion>
   or join via <mailto:logarion-join@lists.orbitalfox.eu>
 
-Opam packages
-
-	opam repo add orbifx https://opam.orbitalfox.eu
-	opam install logarion
-
 
 Install development version
 
diff --git a/cli/convert.ml b/cli/convert.ml
index d8d7ab2..61d7dec 100644
--- a/cli/convert.ml
+++ b/cli/convert.ml
@@ -1,5 +1,3 @@
-let version = "%%VERSION%%"
-
 open Logarion
 module A = Archive.Make (Logarion.File_store)
 
diff --git a/http/http.ml b/http/http.ml
index 83ca424..5da1b70 100644
--- a/http/http.ml
+++ b/http/http.ml
@@ -1,5 +1,3 @@
-let version = "%%VERSION%%"
-
 let http_body fn uri =
 	let open Lwt in
 	let open Cohttp_lwt_unix in