Mike Gerwitz

Free Software Hacker+Activist

aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Gerwitz <mike@mikegerwitz.com>2013-05-21 22:45:13 -0400
committerMike Gerwitz <mike@mikegerwitz.com>2013-05-21 22:45:13 -0400
commitaf9661fcc21b11bc61b838d77497fac41fb692f4 (patch)
tree0b8a7772c2676f16f021062adbfc6c66b4db04ab
parent05e85eb4dcfc08fdcbdf94e34f995da6f1d7192c (diff)
downloadthoughts-af9661fcc21b11bc61b838d77497fac41fb692f4.tar.gz
thoughts-af9661fcc21b11bc61b838d77497fac41fb692f4.tar.bz2
thoughts-af9661fcc21b11bc61b838d77497fac41fb692f4.zip
repo2html will now output directly into www-root
-rw-r--r--.gitignore6
-rw-r--r--Makefile11
2 files changed, 7 insertions, 10 deletions
diff --git a/.gitignore b/.gitignore
index f8e29f4..44f8986 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,2 @@
-index.html
-rss.xml
+# build dir
www-root
-
-# thoughts
-[0-9]*/
diff --git a/Makefile b/Makefile
index f4e435f..fca5c59 100644
--- a/Makefile
+++ b/Makefile
@@ -18,6 +18,7 @@
# list of articles to compile
articles := $(patsubst %.txt, %.html, $(wildcard papers/*.txt))
+www_root := www-root/
.PHONY: default clean thoughts
@@ -25,6 +26,7 @@ articles := $(patsubst %.txt, %.html, $(wildcard papers/*.txt))
default: www-root
thoughts:
+ mkdir -p "$(www_root)"
repo2html \
-t "Mike Gerwitz's Thoughts and Ramblings" \
-d 'The miscellaneous thoughts and ramblings of a free software hacker' \
@@ -33,9 +35,10 @@ thoughts:
-C '/style.css' \
-T "$(PWD)/tpl" \
-E \
- -R40 \
+ -R 40 \
+ -o "$(www_root)" \
'http://mikegerwitz.com/thoughts/' \
- > index.html
+ > "$(www_root)/index.html"
# all .txt articles will be compiled with asciidoc, then post-processed with the
# mgify script
@@ -48,12 +51,10 @@ thoughts:
www-root: $(articles) thoughts
mkdir -p www-root/papers
- cp index.html www-root/
cp papers/*.html www-root/papers/
- cp -r [0-9]* www-root/
cp -r images/ www-root/
cp style.css www-root/
ln -sf ../images www-root/papers/images
clean:
- rm -rf [0-9]*/
+ rm -rf [0-9]*/ www-root/