3 files changed, 5 insertions(+), 10 deletions(-)

M .envrc
M Makefile
M src/tropin/site.scm

@@ 8,5 8,5 @@ export TEST_PEERTUBE_RTMP_KEY=key2
 export EMACSLOADPATH=
 
 # use guixs
-eval `guix shell jq guile haunt \
+eval `./target/profiles/guix/bin/guix shell jq guile haunt \
 emacs-htmlize emacs-next-pgtk --search-paths`

@@ 36,9 36,9 @@ deploy-pinky: guix
 	-x -- sudo herd restart nginx
 
 serve:
-	guile -c '((@ (haunt serve web-server) serve) "target/tmp-site")'
+	guile -c '((@ (haunt serve web-server) serve) "target/site/html")'
 
-tmp-site:
+site:
 	guile -L ./src -c \
 	'((@ (haunt site) build-site) (@ (tropin site) main-site))'
 


@@ 49,10 49,7 @@ rde-manual: target ../rde/doc/rde.html
 	mkdir -p ./target/site/html/rde
 	cp ../rde/doc/rde.html ./target/site/html/rde/manual.html
 
-site/html: target rde-manual
-	echo ${EMACSLOADPATH}
-	which emacs
-	emacs -Q --script scripts/build-site.el
+site/html: target site rde-manual
 
 site/html.tar.gz: site/html
 	# cp ./target/site/html/index ./target/site/html/index.html


@@ 60,8 57,6 @@ site/html.tar.gz: site/html
 	# cp ./target/site/html/notes/index ./target/site/html/notes/index.html
 	tar -cvzf ./target/site/html.tar.gz -C ./target/site/html .
 
-site: site/html
-
 deploy-site:
 	scp -r ./target/site/html/* pinky:/srv/nginx/trop.in
 	# site/html.tar.gz

@@ 136,7 136,7 @@ build-directory of the site."
         '((author . "Andrew Tropin")
           (email  . "andrew@trop.in"))
         #:readers (list skribe-reader commonmark-reader)
-        #:build-directory "target/tmp-site"
+        #:build-directory "target/site/html"
         #:posts-directory "pages/posts"
         #:builders (list
                     (static-page "pages/index.html" "index.html"