summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile12
-rw-r--r--build.sh5
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"