summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--.guix/run64-website.scm9
-rw-r--r--Makefile6
2 files changed, 5 insertions, 10 deletions
diff --git a/.guix/run64-website.scm b/.guix/run64-website.scm
index ad82072..8ceb63c 100644
--- a/.guix/run64-website.scm
+++ b/.guix/run64-website.scm
@@ -17,7 +17,6 @@
 ;;; along with run64.  If not, see <https://www.gnu.org/licenses/>.
 
 (define-module (run64-website)
-  #:use-module ((gnu packages base) #:select (gnu-make))
   #:use-module ((gnu packages emacs) #:select (emacs-minimal))
   #:use-module (guix gexp)
   #:use-module (guix packages)
@@ -30,9 +29,11 @@
 
         (copy-recursively #$(package-source guile-run64)
                           (getcwd))
-        (invoke #$(file-append gnu-make "/bin/make")
-                "website"
-                (string-append "EMACS=" #$(file-append emacs-minimal "/bin/emacs")))
+        (invoke #$(file-append emacs-minimal "/bin/emacs")
+                "--quick"
+                "--batch"
+                "--load" "build-aux/build-home-page.el"
+                "--funcall" "build-website")
         (copy-recursively "website" #$output))))
 
 (define-public run64-website
diff --git a/Makefile b/Makefile
index 058c1d1..905b88c 100644
--- a/Makefile
+++ b/Makefile
@@ -16,7 +16,6 @@
 # You should have received a copy of the GNU General Public License
 # along with run64.  If not, see <https://www.gnu.org/licenses/>.
 
-EMACS = emacs
 SED = sed
 
 prefix ?= /usr/local
@@ -37,8 +36,3 @@ install: $(scripts)
         # guile in your PATH. We want to use that guile and not put in
         # a specific guile.
 	$(SED) -i 's|$$(dirname $$0)/run64|$(bindir)/run64|' $(bindir)/guile-run64
-
-website: website/index.html
-
-website/index.html: README.org build-aux/build-home-page.el
-	$(EMACS) -Q --batch --load build-aux/build-home-page.el --funcall build-website