From d132a513d328f6f34c1dfca8fd02c43e757c3cdd Mon Sep 17 00:00:00 2001
From: cage <cage@invalid>
Date: Sun, 27 Mar 2022 13:37:54 +0200
Subject: [PATCH] - simplified Makefile (used asdf to build the executable in a
 portable way).

---
 Makefile.am | 16 ++++------------
 Makefile.in | 16 ++++------------
 tinmop.asd  |  2 ++
 3 files changed, 10 insertions(+), 24 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 48bd4b5..3f36a84 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -57,18 +57,10 @@ scripts/welcome-bot.lisp
 dist_man1_MANS       = doc/tinmop.man
 
 $(PACKAGE): $(CONF_PATH_FILE) *.asd src/*
-	if test $$(basename "$(LISP_COMPILER)") = "sbcl"; then \
-		$(LISP_COMPILER) \
-		--eval "(asdf:load-system '$(PACKAGE))" \
-		--eval "(in-package main)" \
-		--eval "(sb-ext:save-lisp-and-die \"$(PACKAGE)\" :toplevel 'main::main :executable t :purify t :save-runtime-options t)"; \
-	else \
-		$(LISP_COMPILER) \
-		--eval "(asdf:load-system '$(PACKAGE))" \
-		--eval "(in-package main)" \
-		--eval "(asdf:make-build :tinmop :type :program :move-here #P\"./\" :epilogue-code '(main::main))" \
-		--eval "(si:exit)"; \
-	fi
+	$(LISP_COMPILER) \
+		--eval "(asdf:make '$(PACKAGE) :build-pathname \"../$(PACKAGE)\")" \
+		--eval "(uiop:quit)"
+	mv src/tinmop $(PACKAGE)
 $(CONF_PATH_FILE):
 	grep "^;" $(CONF_PATH_FILE_IN)                          >  $(CONF_PATH_FILE)
 	echo -e "(in-package :config)\n"                        >> $(CONF_PATH_FILE);
diff --git a/Makefile.in b/Makefile.in
index b665ea6..30a7ced 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1048,18 +1048,10 @@ uninstall-man: uninstall-man1
 
 
 $(PACKAGE): $(CONF_PATH_FILE) *.asd src/*
-	if test $$(basename "$(LISP_COMPILER)") = "sbcl"; then \
-		$(LISP_COMPILER) \
-		--eval "(asdf:load-system '$(PACKAGE))" \
-		--eval "(in-package main)" \
-		--eval "(sb-ext:save-lisp-and-die \"$(PACKAGE)\" :toplevel 'main::main :executable t :purify t :save-runtime-options t)"; \
-	else \
-		$(LISP_COMPILER) \
-		--eval "(asdf:load-system '$(PACKAGE))" \
-		--eval "(in-package main)" \
-		--eval "(asdf:make-build :tinmop :type :program :move-here #P\"./\" :epilogue-code '(main::main))" \
-		--eval "(si:exit)"; \
-	fi
+	$(LISP_COMPILER) \
+		--eval "(asdf:make '$(PACKAGE) :build-pathname \"../$(PACKAGE)\")" \
+		--eval "(uiop:quit)"
+	mv src/tinmop $(PACKAGE)
 $(CONF_PATH_FILE):
 	grep "^;" $(CONF_PATH_FILE_IN)                          >  $(CONF_PATH_FILE)
 	echo -e "(in-package :config)\n"                        >> $(CONF_PATH_FILE);
diff --git a/tinmop.asd b/tinmop.asd
index 1e26e67..8b02a02 100644
--- a/tinmop.asd
+++ b/tinmop.asd
@@ -53,6 +53,8 @@
                :percent-encoding
                :trivial-clipboard
                :uiop)
+  :entry-point "main::main"
+  :build-operation program-op
   :components ((:file "package")
                (:file "idn")
                (:file "config")