From 3a2309c264d25760a43af70ee2491f442552ed45 Mon Sep 17 00:00:00 2001 From: Brian Picciano Date: Fri, 22 Jan 2021 22:09:35 -0700 Subject: [PATCH] fix up makefile, include install target --- Makefile | 12 +++++++++--- build.sh | 5 +++-- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index d6d6419..84ee695 100644 --- a/Makefile +++ b/Makefile @@ -1,3 +1,12 @@ +result: + nix-build -A build + +install: result + nix-env -i "$$(readlink result)" + +clean: + rm result + serve: nix-shell -A serve @@ -6,6 +15,3 @@ update: lock: nix-shell -p bundler -p bundix --run 'bundler lock; bundler package --no-install --path vendor; bundix; rm -rf .bundle vendor' - -build: - nix-build -A build diff --git a/build.sh b/build.sh index 5fdae15..fca12d6 100644 --- a/build.sh +++ b/build.sh @@ -1,5 +1,6 @@ source $stdenv/setup set -e -mkdir -p "$out" -$jekyll_env/bin/jekyll build -s "$src" -d "$out" +d="$out/var/www/blog.mediocregopher.com" +mkdir -p "$d" +$jekyll_env/bin/jekyll build -s "$src" -d "$d"