Change build output directory

Put everything in public/pakages so that at a later date I can add a project
site along with the packages. This change also makes it easier for me to change
my mind about where the packages land.

6 files changed, 213 insertions, 210 deletions

diff --git a/.gitignore b/.gitignore
index 146f2cf..3ce2951 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
 /*/.cask/
-/*/bin/
+/public
+
 /*/dist/
 /*/.eldev/
 
diff --git a/GNUmakefile b/GNUmakefile
index 2e0bf11..ff739af 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -1,3 +1,5 @@
+OUTDIR := public/packages
+
 define GUILE_MODULE
 (use-modules (ice-9 rdelim)
              (ice-9 ports)
@@ -38,7 +40,7 @@ define upload =
 	    --eval "(setq package-user-dir \"local-elpa/\")" \
 	    --load oni-package.el \
 	    --funcall package-initialize \
-	    --eval "(let ((package-archive-upload-base \"bin/\")) \
+	    --eval "(let ((package-archive-upload-base \"$(OUTDIR)/\")) \
                   (mkdir package-archive-upload-base t) \
                   (package-upload-file $1))"
 endef
@@ -48,96 +50,96 @@ define upload-multi-file =
 endef
 
 package: \
-        bin/$(guile (get-module-version "oni-alert")) \
-        bin/$(guile (get-module-version "oni-autohotkey")) \
-        bin/$(guile (get-module-version "oni-bat")) \
-        bin/$(guile (get-module-version "oni-bats")) \
-        bin/$(guile (get-module-version "oni-bookmark")) \
-        bin/$(guile (get-module-version "oni-browse-url")) \
-        bin/$(guile (get-module-version "oni-c")) \
-        bin/$(guile (get-module-version "oni-circe")) \
-        bin/$(guile (get-module-version "oni-clojure")) \
-        bin/$(guile (get-module-version "oni-cmake")) \
-        bin/$(guile (get-module-version "oni-common-lisp")) \
-        bin/$(guile (get-module-version "oni-company")) \
-        bin/$(guile (get-module-version "oni-compilation")) \
-        bin/$(guile (get-module-version "oni-conf")) \
-        bin/$(guile (get-module-version "oni-core")) \
-        bin/$(guile (get-module-version "oni-corfu")) \
-        bin/$(guile (get-module-version "oni-counsel")) \
-        bin/$(guile (get-module-version "oni-cpp")) \
-        bin/$(guile (get-module-version "oni-csharp")) \
-        bin/$(guile (get-module-version "oni-css")) \
-        bin/$(guile (get-module-version "oni-data-dir")) \
-        bin/$(guile (get-module-version "oni-diff-hl")) \
-        bin/$(guile (get-module-version "oni-dired")) \
-        bin/$(guile (get-module-version "oni-docker")) \
-        bin/$(guile (get-module-version "oni-ediff")) \
-        bin/$(guile (get-module-version "oni-elfeed")) \
-        bin/$(guile (get-module-version "oni-elisp")) \
-        bin/$(guile (get-module-version "oni-elm")) \
-        bin/$(guile (get-module-version "oni-embrace")) \
-        bin/$(guile (get-module-version "oni-emms")) \
-        bin/$(guile (get-module-version "oni-epub")) \
-        bin/$(guile (get-module-version "oni-eshell")) \
-        bin/$(guile (get-module-version "oni-eww")) \
-        bin/$(guile (get-module-version "oni-fish")) \
-        bin/$(guile (get-module-version "oni-flycheck")) \
-        bin/$(guile (get-module-version "oni-git-commit")) \
-        bin/$(guile (get-module-version "oni-gnus")) \
-        bin/$(guile (get-module-version "oni-grep")) \
-        bin/$(guile (get-module-version "oni-groovy")) \
-        bin/$(guile (get-multifile-module-version "oni-gui")) \
-        bin/$(guile (get-module-version "oni-haml")) \
-        bin/$(guile (get-module-version "oni-haskell")) \
-        bin/$(guile (get-module-version "oni-highlight-indent-guides")) \
-        bin/$(guile (get-module-version "oni-html")) \
-        bin/$(guile (get-module-version "oni-hydra")) \
-        bin/$(guile (get-module-version "oni-ivy")) \
-        bin/$(guile (get-module-version "oni-jabber")) \
-        bin/$(guile (get-module-version "oni-java")) \
-        bin/$(guile (get-module-version "oni-js")) \
-        bin/$(guile (get-module-version "oni-json")) \
-        bin/$(guile (get-module-version "oni-log-edit")) \
-        bin/$(guile (get-module-version "oni-lsp")) \
-        bin/$(guile (get-module-version "oni-lua")) \
-        bin/$(guile (get-module-version "oni-lui")) \
-        bin/$(guile (get-module-version "oni-magit")) \
-        bin/$(guile (get-module-version "oni-makefile")) \
-        bin/$(guile (get-module-version "oni-notmuch")) \
-        bin/$(guile (get-module-version "oni-nxml")) \
-        bin/$(guile (get-multifile-module-version "oni-org")) \
-        bin/$(guile (get-module-version "oni-org-roam")) \
-        bin/$(guile (get-module-version "oni-package")) \
-        bin/$(guile (get-module-version "oni-paredit")) \
-        bin/$(guile (get-multifile-module-version "oni-php")) \
-        bin/$(guile (get-module-version "oni-powershell")) \
-        bin/$(guile (get-module-version "oni-prescient")) \
-        bin/$(guile (get-module-version "oni-projectile")) \
-        bin/$(guile (get-module-version "oni-python")) \
-        bin/$(guile (get-module-version "oni-ruby")) \
-        bin/$(guile (get-module-version "oni-rust")) \
-        bin/$(guile (get-module-version "oni-scheme")) \
-        bin/$(guile (get-module-version "oni-shackle")) \
-        bin/$(guile (get-module-version "oni-sh")) \
-        bin/$(guile (get-module-version "oni-shr")) \
-        bin/$(guile (get-module-version "oni-slack")) \
-        bin/$(guile (get-module-version "oni-smartparens")) \
-        bin/$(guile (get-module-version "oni-smt")) \
-        bin/$(guile (get-module-version "oni-sort")) \
-        bin/$(guile (get-module-version "oni-termux")) \
-        bin/$(guile (get-module-version "oni-tramp")) \
-        bin/$(guile (get-module-version "oni-tui")) \
-        bin/$(guile (get-module-version "oni-twig")) \
-        bin/$(guile (get-module-version "oni-ui")) \
-        bin/$(guile (get-module-version "oni-vc")) \
-        bin/$(guile (get-module-version "oni-vterm")) \
-        bin/$(guile (get-module-version "oni-web")) \
-        bin/$(guile (get-module-version "oni-yaml")) \
-        bin/$(guile (get-multifile-module-version "oni-yasnippet")) \
+        $(OUTDIR)/$(guile (get-module-version "oni-alert")) \
+        $(OUTDIR)/$(guile (get-module-version "oni-autohotkey")) \
+        $(OUTDIR)/$(guile (get-module-version "oni-bat")) \
+        $(OUTDIR)/$(guile (get-module-version "oni-bats")) \
+        $(OUTDIR)/$(guile (get-module-version "oni-bookmark")) \
+        $(OUTDIR)/$(guile (get-module-version "oni-browse-url")) \
+        $(OUTDIR)/$(guile (get-module-version "oni-c")) \
+        $(OUTDIR)/$(guile (get-module-version "oni-circe")) \
+        $(OUTDIR)/$(guile (get-module-version "oni-clojure")) \
+        $(OUTDIR)/$(guile (get-module-version "oni-cmake")) \
+        $(OUTDIR)/$(guile (get-module-version "oni-common-lisp")) \
+        $(OUTDIR)/$(guile (get-module-version "oni-company")) \
+        $(OUTDIR)/$(guile (get-module-version "oni-compilation")) \
+        $(OUTDIR)/$(guile (get-module-version "oni-conf")) \
+        $(OUTDIR)/$(guile (get-module-version "oni-core")) \
+        $(OUTDIR)/$(guile (get-module-version "oni-corfu")) \
+        $(OUTDIR)/$(guile (get-module-version "oni-counsel")) \
+        $(OUTDIR)/$(guile (get-module-version "oni-cpp")) \
+        $(OUTDIR)/$(guile (get-module-version "oni-csharp")) \
+        $(OUTDIR)/$(guile (get-module-version "oni-css")) \
+        $(OUTDIR)/$(guile (get-module-version "oni-data-dir")) \
+        $(OUTDIR)/$(guile (get-module-version "oni-diff-hl")) \
+        $(OUTDIR)/$(guile (get-module-version "oni-dired")) \
+        $(OUTDIR)/$(guile (get-module-version "oni-docker")) \
+        $(OUTDIR)/$(guile (get-module-version "oni-ediff")) \
+        $(OUTDIR)/$(guile (get-module-version "oni-elfeed")) \
+        $(OUTDIR)/$(guile (get-module-version "oni-elisp")) \
+        $(OUTDIR)/$(guile (get-module-version "oni-elm")) \
+        $(OUTDIR)/$(guile (get-module-version "oni-embrace")) \
+        $(OUTDIR)/$(guile (get-module-version "oni-emms")) \
+        $(OUTDIR)/$(guile (get-module-version "oni-epub")) \
+        $(OUTDIR)/$(guile (get-module-version "oni-eshell")) \
+        $(OUTDIR)/$(guile (get-module-version "oni-eww")) \
+        $(OUTDIR)/$(guile (get-module-version "oni-fish")) \
+        $(OUTDIR)/$(guile (get-module-version "oni-flycheck")) \
+        $(OUTDIR)/$(guile (get-module-version "oni-git-commit")) \
+        $(OUTDIR)/$(guile (get-module-version "oni-gnus")) \
+        $(OUTDIR)/$(guile (get-module-version "oni-grep")) \
+        $(OUTDIR)/$(guile (get-module-version "oni-groovy")) \
+        $(OUTDIR)/$(guile (get-multifile-module-version "oni-gui")) \
+        $(OUTDIR)/$(guile (get-module-version "oni-haml")) \
+        $(OUTDIR)/$(guile (get-module-version "oni-haskell")) \
+        $(OUTDIR)/$(guile (get-module-version "oni-highlight-indent-guides")) \
+        $(OUTDIR)/$(guile (get-module-version "oni-html")) \
+        $(OUTDIR)/$(guile (get-module-version "oni-hydra")) \
+        $(OUTDIR)/$(guile (get-module-version "oni-ivy")) \
+        $(OUTDIR)/$(guile (get-module-version "oni-jabber")) \
+        $(OUTDIR)/$(guile (get-module-version "oni-java")) \
+        $(OUTDIR)/$(guile (get-module-version "oni-js")) \
+        $(OUTDIR)/$(guile (get-module-version "oni-json")) \
+        $(OUTDIR)/$(guile (get-module-version "oni-log-edit")) \
+        $(OUTDIR)/$(guile (get-module-version "oni-lsp")) \
+        $(OUTDIR)/$(guile (get-module-version "oni-lua")) \
+        $(OUTDIR)/$(guile (get-module-version "oni-lui")) \
+        $(OUTDIR)/$(guile (get-module-version "oni-magit")) \
+        $(OUTDIR)/$(guile (get-module-version "oni-makefile")) \
+        $(OUTDIR)/$(guile (get-module-version "oni-notmuch")) \
+        $(OUTDIR)/$(guile (get-module-version "oni-nxml")) \
+        $(OUTDIR)/$(guile (get-multifile-module-version "oni-org")) \
+        $(OUTDIR)/$(guile (get-module-version "oni-org-roam")) \
+        $(OUTDIR)/$(guile (get-module-version "oni-package")) \
+        $(OUTDIR)/$(guile (get-module-version "oni-paredit")) \
+        $(OUTDIR)/$(guile (get-multifile-module-version "oni-php")) \
+        $(OUTDIR)/$(guile (get-module-version "oni-powershell")) \
+        $(OUTDIR)/$(guile (get-module-version "oni-prescient")) \
+        $(OUTDIR)/$(guile (get-module-version "oni-projectile")) \
+        $(OUTDIR)/$(guile (get-module-version "oni-python")) \
+        $(OUTDIR)/$(guile (get-module-version "oni-ruby")) \
+        $(OUTDIR)/$(guile (get-module-version "oni-rust")) \
+        $(OUTDIR)/$(guile (get-module-version "oni-scheme")) \
+        $(OUTDIR)/$(guile (get-module-version "oni-shackle")) \
+        $(OUTDIR)/$(guile (get-module-version "oni-sh")) \
+        $(OUTDIR)/$(guile (get-module-version "oni-shr")) \
+        $(OUTDIR)/$(guile (get-module-version "oni-slack")) \
+        $(OUTDIR)/$(guile (get-module-version "oni-smartparens")) \
+        $(OUTDIR)/$(guile (get-module-version "oni-smt")) \
+        $(OUTDIR)/$(guile (get-module-version "oni-sort")) \
+        $(OUTDIR)/$(guile (get-module-version "oni-termux")) \
+        $(OUTDIR)/$(guile (get-module-version "oni-tramp")) \
+        $(OUTDIR)/$(guile (get-module-version "oni-tui")) \
+        $(OUTDIR)/$(guile (get-module-version "oni-twig")) \
+        $(OUTDIR)/$(guile (get-module-version "oni-ui")) \
+        $(OUTDIR)/$(guile (get-module-version "oni-vc")) \
+        $(OUTDIR)/$(guile (get-module-version "oni-vterm")) \
+        $(OUTDIR)/$(guile (get-module-version "oni-web")) \
+        $(OUTDIR)/$(guile (get-module-version "oni-yaml")) \
+        $(OUTDIR)/$(guile (get-multifile-module-version "oni-yasnippet")) \
 
 clean:
-	rm -rfv .eldev bin
+	rm -rfv .eldev public
 	find . -type d -name '.eldev' -exec rm -rv '{}' \;
 	find . -type d -name 'dist' -exec rm -rv '{}' \;
 
@@ -163,284 +165,284 @@ integration-test-%: install-%
 
 ## Single-file packages
 
-bin/$(guile (get-module-version "oni-smartparens")): oni-smartparens.el
+$(OUTDIR)/$(guile (get-module-version "oni-smartparens")): oni-smartparens.el
 	$(call upload,\"$<\")
 
-bin/$(guile (get-module-version "oni-flycheck")): oni-flycheck.el
+$(OUTDIR)/$(guile (get-module-version "oni-flycheck")): oni-flycheck.el
 	$(call upload,\"$<\")
 
-bin/$(guile (get-module-version "oni-sh")): oni-sh.el \
-        bin/$(guile (get-module-version "oni-smartparens")) \
-        bin/$(guile (get-module-version "oni-flycheck"))
+$(OUTDIR)/$(guile (get-module-version "oni-sh")): oni-sh.el \
+        $(OUTDIR)/$(guile (get-module-version "oni-smartparens")) \
+        $(OUTDIR)/$(guile (get-module-version "oni-flycheck"))
 	$(call upload,\"$<\")
 
-bin/$(guile (get-module-version "oni-company")): oni-company.el \
-        bin/$(guile (get-module-version "oni-prescient"))
+$(OUTDIR)/$(guile (get-module-version "oni-company")): oni-company.el \
+        $(OUTDIR)/$(guile (get-module-version "oni-prescient"))
 	$(call upload,\"$<\")
 
-bin/$(guile (get-module-version "oni-compilation")): oni-compilation.el
+$(OUTDIR)/$(guile (get-module-version "oni-compilation")): oni-compilation.el
 	$(call upload,\"$<\")
 
-bin/$(guile (get-module-version "oni-conf")): oni-conf.el
+$(OUTDIR)/$(guile (get-module-version "oni-conf")): oni-conf.el
 	$(call upload,\"$<\")
 
-bin/$(guile (get-module-version "oni-core")): oni-core.el
+$(OUTDIR)/$(guile (get-module-version "oni-core")): oni-core.el
 	$(call upload,\"$<\")
 
-bin/$(guile (get-module-version "oni-corfu")): oni-corfu.el \
-        bin/$(guile (get-module-version "oni-prescient"))
+$(OUTDIR)/$(guile (get-module-version "oni-corfu")): oni-corfu.el \
+        $(OUTDIR)/$(guile (get-module-version "oni-prescient"))
 	$(call upload,\"$<\")
 
-bin/$(guile (get-module-version "oni-counsel")): oni-counsel.el
+$(OUTDIR)/$(guile (get-module-version "oni-counsel")): oni-counsel.el
 	$(call upload,\"$<\")
 
-bin/$(guile (get-module-version "oni-cpp")): oni-cpp.el
+$(OUTDIR)/$(guile (get-module-version "oni-cpp")): oni-cpp.el
 	$(call upload,\"$<\")
 
-bin/$(guile (get-module-version "oni-csharp")): oni-csharp.el \
-        bin/$(guile (get-module-version "oni-company")) \
-        bin/$(guile (get-module-version "oni-flycheck")) \
-        bin/$(guile (get-module-version "oni-hydra")) \
-        bin/$(guile (get-module-version "oni-lsp")) \
-        bin/$(guile (get-module-version "oni-smartparens"))
+$(OUTDIR)/$(guile (get-module-version "oni-csharp")): oni-csharp.el \
+        $(OUTDIR)/$(guile (get-module-version "oni-company")) \
+        $(OUTDIR)/$(guile (get-module-version "oni-flycheck")) \
+        $(OUTDIR)/$(guile (get-module-version "oni-hydra")) \
+        $(OUTDIR)/$(guile (get-module-version "oni-lsp")) \
+        $(OUTDIR)/$(guile (get-module-version "oni-smartparens"))
 	$(call upload,\"$<\")
 
-bin/$(guile (get-module-version "oni-css")): oni-css.el \
-        bin/$(guile (get-module-version "oni-company")) \
-        bin/$(guile (get-module-version "oni-hydra"))
+$(OUTDIR)/$(guile (get-module-version "oni-css")): oni-css.el \
+        $(OUTDIR)/$(guile (get-module-version "oni-company")) \
+        $(OUTDIR)/$(guile (get-module-version "oni-hydra"))
 	$(call upload,\"$<\")
 
-bin/$(guile (get-module-version "oni-prescient")): oni-prescient.el \
-        bin/$(guile (get-module-version "oni-data-dir"))
+$(OUTDIR)/$(guile (get-module-version "oni-prescient")): oni-prescient.el \
+        $(OUTDIR)/$(guile (get-module-version "oni-data-dir"))
 	$(call upload,\"$<\")
 
-bin/$(guile (get-module-version "oni-data-dir")): oni-data-dir.el
+$(OUTDIR)/$(guile (get-module-version "oni-data-dir")): oni-data-dir.el
 	$(call upload,\"$<\")
 
-bin/$(guile (get-module-version "oni-diff-hl")): oni-diff-hl.el
+$(OUTDIR)/$(guile (get-module-version "oni-diff-hl")): oni-diff-hl.el
 	$(call upload,\"$<\")
 
-bin/$(guile (get-module-version "oni-dired")): oni-dired.el
+$(OUTDIR)/$(guile (get-module-version "oni-dired")): oni-dired.el
 	$(call upload,\"$<\")
 
-bin/$(guile (get-module-version "oni-docker")): oni-docker.el
+$(OUTDIR)/$(guile (get-module-version "oni-docker")): oni-docker.el
 	$(call upload,\"$<\")
 
-bin/$(guile (get-module-version "oni-ediff")): oni-ediff.el
+$(OUTDIR)/$(guile (get-module-version "oni-ediff")): oni-ediff.el
 	$(call upload,\"$<\")
 
-bin/$(guile (get-module-version "oni-elfeed")): oni-elfeed.el
+$(OUTDIR)/$(guile (get-module-version "oni-elfeed")): oni-elfeed.el
 	$(call upload,\"$<\")
 
-bin/$(guile (get-module-version "oni-elisp")): oni-elisp.el \
-        bin/$(guile (get-module-version "oni-flycheck")) \
-        bin/$(guile (get-module-version "oni-company")) \
-        bin/$(guile (get-module-version "oni-paredit")) \
-        bin/$(guile (get-module-version "oni-hydra"))
+$(OUTDIR)/$(guile (get-module-version "oni-elisp")): oni-elisp.el \
+        $(OUTDIR)/$(guile (get-module-version "oni-flycheck")) \
+        $(OUTDIR)/$(guile (get-module-version "oni-company")) \
+        $(OUTDIR)/$(guile (get-module-version "oni-paredit")) \
+        $(OUTDIR)/$(guile (get-module-version "oni-hydra"))
 	$(call upload,\"$<\")
 
-bin/$(guile (get-module-version "oni-elm")): oni-elm.el
+$(OUTDIR)/$(guile (get-module-version "oni-elm")): oni-elm.el
 	$(call upload,\"$<\")
 
-bin/$(guile (get-module-version "oni-embrace")): oni-embrace.el
+$(OUTDIR)/$(guile (get-module-version "oni-embrace")): oni-embrace.el
 	$(call upload,\"$<\")
 
-bin/$(guile (get-module-version "oni-emms")): oni-emms.el
+$(OUTDIR)/$(guile (get-module-version "oni-emms")): oni-emms.el
 	$(call upload,\"$<\")
 
-bin/$(guile (get-module-version "oni-epub")): oni-epub.el
+$(OUTDIR)/$(guile (get-module-version "oni-epub")): oni-epub.el
 	$(call upload,\"$<\")
 
-bin/$(guile (get-module-version "oni-eshell")): oni-eshell.el
+$(OUTDIR)/$(guile (get-module-version "oni-eshell")): oni-eshell.el
 	$(call upload,\"$<\")
 
-bin/$(guile (get-module-version "oni-eww")): oni-eww.el
+$(OUTDIR)/$(guile (get-module-version "oni-eww")): oni-eww.el
 	$(call upload,\"$<\")
 
-bin/$(guile (get-module-version "oni-fish")): oni-fish.el
+$(OUTDIR)/$(guile (get-module-version "oni-fish")): oni-fish.el
 	$(call upload,\"$<\")
 
-bin/$(guile (get-module-version "oni-git-commit")): oni-git-commit.el
+$(OUTDIR)/$(guile (get-module-version "oni-git-commit")): oni-git-commit.el
 	$(call upload,\"$<\")
 
-bin/$(guile (get-module-version "oni-gnus")): oni-gnus.el
+$(OUTDIR)/$(guile (get-module-version "oni-gnus")): oni-gnus.el
 	$(call upload,\"$<\")
 
-bin/$(guile (get-module-version "oni-grep")): oni-grep.el
+$(OUTDIR)/$(guile (get-module-version "oni-grep")): oni-grep.el
 	$(call upload,\"$<\")
 
-bin/$(guile (get-module-version "oni-groovy")): oni-groovy.el
+$(OUTDIR)/$(guile (get-module-version "oni-groovy")): oni-groovy.el
 	$(call upload,\"$<\")
 
-bin/$(guile (get-module-version "oni-haml")): oni-haml.el
+$(OUTDIR)/$(guile (get-module-version "oni-haml")): oni-haml.el
 	$(call upload,\"$<\")
 
-bin/$(guile (get-module-version "oni-haskell")): oni-haskell.el
+$(OUTDIR)/$(guile (get-module-version "oni-haskell")): oni-haskell.el
 	$(call upload,\"$<\")
 
-bin/$(guile (get-module-version "oni-highlight-indent-guides")): oni-highlight-indent-guides.el
+$(OUTDIR)/$(guile (get-module-version "oni-highlight-indent-guides")): oni-highlight-indent-guides.el
 	$(call upload,\"$<\")
 
-bin/$(guile (get-module-version "oni-html")): oni-html.el
+$(OUTDIR)/$(guile (get-module-version "oni-html")): oni-html.el
 	$(call upload,\"$<\")
 
-bin/$(guile (get-module-version "oni-hydra")): oni-hydra.el
+$(OUTDIR)/$(guile (get-module-version "oni-hydra")): oni-hydra.el
 	$(call upload,\"$<\")
 
-bin/$(guile (get-module-version "oni-ivy")): oni-ivy.el
+$(OUTDIR)/$(guile (get-module-version "oni-ivy")): oni-ivy.el
 	$(call upload,\"$<\")
 
-bin/$(guile (get-module-version "oni-jabber")): oni-jabber.el
+$(OUTDIR)/$(guile (get-module-version "oni-jabber")): oni-jabber.el
 	$(call upload,\"$<\")
 
-bin/$(guile (get-module-version "oni-java")): oni-java.el
+$(OUTDIR)/$(guile (get-module-version "oni-java")): oni-java.el
 	$(call upload,\"$<\")
 
-bin/$(guile (get-module-version "oni-js")): oni-js.el
+$(OUTDIR)/$(guile (get-module-version "oni-js")): oni-js.el
 	$(call upload,\"$<\")
 
-bin/$(guile (get-module-version "oni-json")): oni-json.el
+$(OUTDIR)/$(guile (get-module-version "oni-json")): oni-json.el
 	$(call upload,\"$<\")
 
-bin/$(guile (get-module-version "oni-log-edit")): oni-log-edit.el
+$(OUTDIR)/$(guile (get-module-version "oni-log-edit")): oni-log-edit.el
 	$(call upload,\"$<\")
 
-bin/$(guile (get-module-version "oni-lsp")): oni-lsp.el
+$(OUTDIR)/$(guile (get-module-version "oni-lsp")): oni-lsp.el
 	$(call upload,\"$<\")
 
-bin/$(guile (get-module-version "oni-lua")): oni-lua.el
+$(OUTDIR)/$(guile (get-module-version "oni-lua")): oni-lua.el
 	$(call upload,\"$<\")
 
-bin/$(guile (get-module-version "oni-lui")): oni-lui.el
+$(OUTDIR)/$(guile (get-module-version "oni-lui")): oni-lui.el
 	$(call upload,\"$<\")
 
-bin/$(guile (get-module-version "oni-magit")): oni-magit.el
+$(OUTDIR)/$(guile (get-module-version "oni-magit")): oni-magit.el
 	$(call upload,\"$<\")
 
-bin/$(guile (get-module-version "oni-makefile")): oni-makefile.el
+$(OUTDIR)/$(guile (get-module-version "oni-makefile")): oni-makefile.el
 	$(call upload,\"$<\")
 
-bin/$(guile (get-module-version "oni-notmuch")): oni-notmuch.el
+$(OUTDIR)/$(guile (get-module-version "oni-notmuch")): oni-notmuch.el
 	$(call upload,\"$<\")
 
-bin/$(guile (get-module-version "oni-nxml")): oni-nxml.el
+$(OUTDIR)/$(guile (get-module-version "oni-nxml")): oni-nxml.el
 	$(call upload,\"$<\")
 
-bin/$(guile (get-module-version "oni-org-roam")): oni-org-roam.el
+$(OUTDIR)/$(guile (get-module-version "oni-org-roam")): oni-org-roam.el
 	$(call upload,\"$<\")
 
-bin/$(guile (get-module-version "oni-package")): oni-package.el
+$(OUTDIR)/$(guile (get-module-version "oni-package")): oni-package.el
 	$(call upload,\"$<\")
 
-bin/$(guile (get-module-version "oni-paredit")): oni-paredit.el
+$(OUTDIR)/$(guile (get-module-version "oni-paredit")): oni-paredit.el
 	$(call upload,\"$<\")
 
-bin/$(guile (get-module-version "oni-powershell")): oni-powershell.el
+$(OUTDIR)/$(guile (get-module-version "oni-powershell")): oni-powershell.el
 	$(call upload,\"$<\")
 
-bin/$(guile (get-module-version "oni-projectile")): oni-projectile.el
+$(OUTDIR)/$(guile (get-module-version "oni-projectile")): oni-projectile.el
 	$(call upload,\"$<\")
 
-bin/$(guile (get-module-version "oni-python")): oni-python.el \
-        bin/$(guile (get-module-version "oni-company")) \
-        bin/$(guile (get-module-version "oni-flycheck")) \
-        bin/$(guile (get-module-version "oni-hydra")) \
-        bin/$(guile (get-module-version "oni-lsp"))
+$(OUTDIR)/$(guile (get-module-version "oni-python")): oni-python.el \
+        $(OUTDIR)/$(guile (get-module-version "oni-company")) \
+        $(OUTDIR)/$(guile (get-module-version "oni-flycheck")) \
+        $(OUTDIR)/$(guile (get-module-version "oni-hydra")) \
+        $(OUTDIR)/$(guile (get-module-version "oni-lsp"))
 	$(call upload,\"$<\")
 
-bin/$(guile (get-module-version "oni-ruby")): oni-ruby.el
+$(OUTDIR)/$(guile (get-module-version "oni-ruby")): oni-ruby.el
 	$(call upload,\"$<\")
 
-bin/$(guile (get-module-version "oni-rust")): oni-rust.el
+$(OUTDIR)/$(guile (get-module-version "oni-rust")): oni-rust.el
 	$(call upload,\"$<\")
 
-bin/$(guile (get-module-version "oni-scheme")): oni-scheme.el
+$(OUTDIR)/$(guile (get-module-version "oni-scheme")): oni-scheme.el
 	$(call upload,\"$<\")
 
-bin/$(guile (get-module-version "oni-shackle")): oni-shackle.el
+$(OUTDIR)/$(guile (get-module-version "oni-shackle")): oni-shackle.el
 	$(call upload,\"$<\")
 
-bin/$(guile (get-module-version "oni-shr")): oni-shr.el
+$(OUTDIR)/$(guile (get-module-version "oni-shr")): oni-shr.el
 	$(call upload,\"$<\")
 
-bin/$(guile (get-module-version "oni-slack")): oni-slack.el
+$(OUTDIR)/$(guile (get-module-version "oni-slack")): oni-slack.el
 	$(call upload,\"$<\")
 
-bin/$(guile (get-module-version "oni-smt")): oni-smt.el
+$(OUTDIR)/$(guile (get-module-version "oni-smt")): oni-smt.el
 	$(call upload,\"$<\")
 
-bin/$(guile (get-module-version "oni-sort")): oni-sort.el
+$(OUTDIR)/$(guile (get-module-version "oni-sort")): oni-sort.el
 	$(call upload,\"$<\")
 
-bin/$(guile (get-module-version "oni-termux")): oni-termux.el
+$(OUTDIR)/$(guile (get-module-version "oni-termux")): oni-termux.el
 	$(call upload,\"$<\")
 
-bin/$(guile (get-module-version "oni-tramp")): oni-tramp.el
+$(OUTDIR)/$(guile (get-module-version "oni-tramp")): oni-tramp.el
 	$(call upload,\"$<\")
 
-bin/$(guile (get-module-version "oni-tui")): oni-tui.el
+$(OUTDIR)/$(guile (get-module-version "oni-tui")): oni-tui.el
 	$(call upload,\"$<\")
 
-bin/$(guile (get-module-version "oni-twig")): oni-twig.el
+$(OUTDIR)/$(guile (get-module-version "oni-twig")): oni-twig.el
 	$(call upload,\"$<\")
 
-bin/$(guile (get-module-version "oni-ui")): oni-ui.el
+$(OUTDIR)/$(guile (get-module-version "oni-ui")): oni-ui.el
 	$(call upload,\"$<\")
 
-bin/$(guile (get-module-version "oni-vc")): oni-vc.el
+$(OUTDIR)/$(guile (get-module-version "oni-vc")): oni-vc.el
 	$(call upload,\"$<\")
 
-bin/$(guile (get-module-version "oni-vterm")): oni-vterm.el
+$(OUTDIR)/$(guile (get-module-version "oni-vterm")): oni-vterm.el
 	$(call upload,\"$<\")
 
-bin/$(guile (get-module-version "oni-web")): oni-web.el
+$(OUTDIR)/$(guile (get-module-version "oni-web")): oni-web.el
 	$(call upload,\"$<\")
 
-bin/$(guile (get-module-version "oni-yaml")): oni-yaml.el
+$(OUTDIR)/$(guile (get-module-version "oni-yaml")): oni-yaml.el
 	$(call upload,\"$<\")
 
-bin/$(guile (get-module-version "oni-alert")): oni-alert.el
+$(OUTDIR)/$(guile (get-module-version "oni-alert")): oni-alert.el
 	$(call upload,\"$<\")
 
-bin/$(guile (get-module-version "oni-autohotkey")): oni-autohotkey.el
+$(OUTDIR)/$(guile (get-module-version "oni-autohotkey")): oni-autohotkey.el
 	$(call upload,\"$<\")
 
-bin/$(guile (get-module-version "oni-bat")): oni-bat.el
+$(OUTDIR)/$(guile (get-module-version "oni-bat")): oni-bat.el
 	$(call upload,\"$<\")
 
-bin/$(guile (get-module-version "oni-bats")): oni-bats.el \
-        bin/$(guile (get-module-version "oni-sh"))
+$(OUTDIR)/$(guile (get-module-version "oni-bats")): oni-bats.el \
+        $(OUTDIR)/$(guile (get-module-version "oni-sh"))
 	$(call upload,\"$<\")
 
-bin/$(guile (get-module-version "oni-bookmark")): oni-bookmark.el
+$(OUTDIR)/$(guile (get-module-version "oni-bookmark")): oni-bookmark.el
 	$(call upload,\"$<\")
 
-bin/$(guile (get-module-version "oni-browse-url")): oni-browse-url.el
+$(OUTDIR)/$(guile (get-module-version "oni-browse-url")): oni-browse-url.el
 	$(call upload,\"$<\")
 
-bin/$(guile (get-module-version "oni-c")): oni-c.el
+$(OUTDIR)/$(guile (get-module-version "oni-c")): oni-c.el
 	$(call upload,\"$<\")
 
-bin/$(guile (get-module-version "oni-circe")): oni-circe.el
+$(OUTDIR)/$(guile (get-module-version "oni-circe")): oni-circe.el
 	$(call upload,\"$<\")
 
-bin/$(guile (get-module-version "oni-clojure")): oni-clojure.el
+$(OUTDIR)/$(guile (get-module-version "oni-clojure")): oni-clojure.el
 	$(call upload,\"$<\")
 
-bin/$(guile (get-module-version "oni-cmake")): oni-cmake.el
+$(OUTDIR)/$(guile (get-module-version "oni-cmake")): oni-cmake.el
 	$(call upload,\"$<\")
 
-bin/$(guile (get-module-version "oni-common-lisp")): oni-common-lisp.el
+$(OUTDIR)/$(guile (get-module-version "oni-common-lisp")): oni-common-lisp.el
 	$(call upload,\"$<\")
 
 ## oni-gui
 
 oni-gui/dist/$(guile (get-multifile-module-version "oni-gui")): \
         oni-gui/oni-gui.el \
-        bin/$(guile (get-module-version "oni-ui"))
+        $(OUTDIR)/$(guile (get-module-version "oni-ui"))
 	cd oni-gui && eldev package
 
-bin/$(guile (get-multifile-module-version "oni-gui")): \
+$(OUTDIR)/$(guile (get-multifile-module-version "oni-gui")): \
         oni-gui/dist/$(guile (get-multifile-module-version "oni-gui"))
 	$(call upload-multi-file,oni-gui)
 
@@ -448,11 +450,11 @@ bin/$(guile (get-multifile-module-version "oni-gui")): \
 
 oni-org/dist/$(guile (get-multifile-module-version "oni-org")): \
         oni-org/oni-org.el \
-        bin/$(guile (get-module-version "oni-alert")) \
-        bin/$(guile (get-module-version "oni-hydra"))
+        $(OUTDIR)/$(guile (get-module-version "oni-alert")) \
+        $(OUTDIR)/$(guile (get-module-version "oni-hydra"))
 	cd oni-org && eldev package
 
-bin/$(guile (get-multifile-module-version "oni-org")): \
+$(OUTDIR)/$(guile (get-multifile-module-version "oni-org")): \
         oni-org/dist/$(guile (get-multifile-module-version "oni-org"))
 	$(call upload-multi-file,oni-org)
 
@@ -460,14 +462,14 @@ bin/$(guile (get-multifile-module-version "oni-org")): \
 
 oni-php/dist/$(guile (get-multifile-module-version "oni-php")): \
         oni-php/oni-php.el \
-        bin/$(guile (get-module-version "oni-flycheck")) \
-        bin/$(guile (get-module-version "oni-prescient")) \
-        bin/$(guile (get-module-version "oni-data-dir")) \
-        bin/$(guile (get-module-version "oni-hydra")) \
-        bin/$(guile (get-module-version "oni-corfu"))
+        $(OUTDIR)/$(guile (get-module-version "oni-flycheck")) \
+        $(OUTDIR)/$(guile (get-module-version "oni-prescient")) \
+        $(OUTDIR)/$(guile (get-module-version "oni-data-dir")) \
+        $(OUTDIR)/$(guile (get-module-version "oni-hydra")) \
+        $(OUTDIR)/$(guile (get-module-version "oni-corfu"))
 	cd oni-php && eldev package
 
-bin/$(guile (get-multifile-module-version "oni-php")): \
+$(OUTDIR)/$(guile (get-multifile-module-version "oni-php")): \
         oni-php/dist/$(guile (get-multifile-module-version "oni-php"))
 	$(call upload-multi-file,oni-php)
 
@@ -477,6 +479,6 @@ oni-yasnippet/dist/$(guile (get-multifile-module-version "oni-yasnippet")): \
         oni-yasnippet/oni-yasnippet.el
 	cd oni-yasnippet && eldev package
 
-bin/$(guile (get-multifile-module-version "oni-yasnippet")): \
+$(OUTDIR)/$(guile (get-multifile-module-version "oni-yasnippet")): \
         oni-yasnippet/dist/$(guile (get-multifile-module-version "oni-yasnippet"))
 	$(call upload-multi-file,oni-yasnippet)
diff --git a/oni-gui/Eldev b/oni-gui/Eldev
index 34b7e29..9c6fc81 100644
--- a/oni-gui/Eldev
+++ b/oni-gui/Eldev
@@ -4,7 +4,7 @@
 (eldev-use-package-archive 'gnu-elpa)
 ;(eldev-use-package-archive 'nongnu-elpa)
 (eldev-use-package-archive 'melpa)
-(eldev-use-package-archive `("oni" . ,(expand-file-name "../bin")))
+(eldev-use-package-archive `("oni" . ,(expand-file-name "../public/packages")))
 
 (eldev-use-plugin 'autoloads)
 
diff --git a/oni-org/Eldev b/oni-org/Eldev
index d25b320..f2baf05 100644
--- a/oni-org/Eldev
+++ b/oni-org/Eldev
@@ -4,7 +4,7 @@
 (eldev-use-package-archive 'gnu-elpa)
 ;(eldev-use-package-archive 'nongnu-elpa)
 (eldev-use-package-archive 'melpa)
-(eldev-use-package-archive `("oni" . ,(expand-file-name "../bin")))
+(eldev-use-package-archive `("oni" . ,(expand-file-name "../public/packages")))
 
 (eldev-use-local-dependency
  (car (directory-files (format "%s/share/emacs/site-lisp" (getenv "GUIX_ENVIRONMENT"))
diff --git a/oni-php/Eldev b/oni-php/Eldev
index 72e2000..2956775 100644
--- a/oni-php/Eldev
+++ b/oni-php/Eldev
@@ -4,7 +4,7 @@
 (eldev-use-package-archive 'gnu-elpa)
 ;(eldev-use-package-archive 'nongnu-elpa)
 (eldev-use-package-archive 'melpa)
-(eldev-use-package-archive `("oni" . ,(expand-file-name "../bin")))
+(eldev-use-package-archive `("oni" . ,(expand-file-name "../public/packages")))
 
 (eldev-use-plugin 'autoloads)
 
diff --git a/oni-yasnippet/Eldev b/oni-yasnippet/Eldev
index 3a4fe49..b6bdf4c 100644
--- a/oni-yasnippet/Eldev
+++ b/oni-yasnippet/Eldev
@@ -4,7 +4,7 @@
 (eldev-use-package-archive 'gnu-elpa)
 ;(eldev-use-package-archive 'nongnu-elpa)
 (eldev-use-package-archive 'melpa)
-(eldev-use-package-archive `("oni" . ,(expand-file-name "../bin")))
+(eldev-use-package-archive `("oni" . ,(expand-file-name "../public/packages")))
 
 (eldev-use-plugin 'autoloads)