From 0ff8f6a7d6c775efa35698e067b4dd6c036ee2cd Mon Sep 17 00:00:00 2001
From: jao <jao@gnu.org>
Date: Tue, 23 Apr 2019 23:09:25 +0100
Subject: Web makefile

---
 doc/web/Makefile           | 32 --------------------------------
 doc/web/makefile           | 35 +++++++++++++++++++++++++++++++++++
 doc/web/xmobar-sawfish.png |  1 -
 doc/web/xmobar-xmonad.png  |  1 -
 doc/web/xmobar.css         |  2 +-
 5 files changed, 36 insertions(+), 35 deletions(-)
 delete mode 100644 doc/web/Makefile
 create mode 100644 doc/web/makefile
 delete mode 120000 doc/web/xmobar-sawfish.png
 delete mode 120000 doc/web/xmobar-xmonad.png

diff --git a/doc/web/Makefile b/doc/web/Makefile
deleted file mode 100644
index 411f589..0000000
--- a/doc/web/Makefile
+++ /dev/null
@@ -1,32 +0,0 @@
-index.src = ../readme.md
-index = readme.md
-releases = ../news.md
-css = xmobar.css
-images = xmobar-sawfish.png xmobar-xmonad.png
-remote = community.haskell.org:/srv/projects/xmobar/
-htmls = index.html releases.html
-title = % xmobar - a minimalistic status bar
-
-default: index.html
-
-$(index): $(index.src)
-	@tail -n+3 $(index.src) | sed "1s/^/$(title)\n/" > $(index)
-
-index.html: releases.html $(index) $(css)
-	pandoc -f markdown -t html -c $(css) --toc -N -s \
-               $(index) > index.html
-
-releases.html: $(releases) $(css)
-	pandoc -f markdown -t html -c $(css) -s \
-               $(releases) > releases.html
-
-upload-images:
-	rsync -zav $(images) $(remote)
-
-upload-pages: $(htmls)
-	scp $(htmls) $(css) $(remote)
-
-upload: upload-images upload-pages
-
-clean:
-	rm -f $(htmls) $(index)
diff --git a/doc/web/makefile b/doc/web/makefile
new file mode 100644
index 0000000..eb6b212
--- /dev/null
+++ b/doc/web/makefile
@@ -0,0 +1,35 @@
+index.src = ../../readme.md
+index = readme.md
+releases = ../../changelog.md
+css = xmobar.css
+images = ../xmobar-sawfish.png ../xmobar-xmonad.png
+remote = root@xmobar.org:/var/www/xmobar.org/
+htmls = index.html releases.html
+title = % xmobar - a minimalistic status bar
+
+default: index.html
+
+$(index): $(index.src)
+	@tail -n+3 $(index.src) | sed "1s/^/$(title)\n/" > $(index)
+
+index.html: releases.html $(index) $(css)
+	pandoc -f markdown -t html -c $(css) --toc -N -s \
+               $(index) > index.html
+
+releases.html: $(releases) $(css)
+	pandoc -f markdown -t html -c $(css) -s \
+               $(releases) > releases.html
+
+imgs:
+	cp $(images) .
+
+upload-images: imgs
+	rsync -zav $(images) $(remote)
+
+upload-pages: $(htmls)
+	scp $(htmls) $(css) $(remote)
+
+upload: upload-images upload-pages
+
+clean:
+	rm -f $(htmls) $(index) *.png
diff --git a/doc/web/xmobar-sawfish.png b/doc/web/xmobar-sawfish.png
deleted file mode 120000
index b3e6bb9..0000000
--- a/doc/web/xmobar-sawfish.png
+++ /dev/null
@@ -1 +0,0 @@
-../xmobar-sawfish.png
\ No newline at end of file
diff --git a/doc/web/xmobar-xmonad.png b/doc/web/xmobar-xmonad.png
deleted file mode 120000
index 26ea6e3..0000000
--- a/doc/web/xmobar-xmonad.png
+++ /dev/null
@@ -1 +0,0 @@
-../xmobar-xmonad.png
\ No newline at end of file
diff --git a/doc/web/xmobar.css b/doc/web/xmobar.css
index 54a44c6..531a146 100644
--- a/doc/web/xmobar.css
+++ b/doc/web/xmobar.css
@@ -13,7 +13,7 @@ body {
 }
 pre {
     border: 1px dotted gray;
-    background-color: #efebe7;
+    background-color: #fafafa;
     color: #111111;
     padding: 0.5em;
 }
-- 
cgit v1.2.3