From: Joey Hess <joey@kitenet.net>
Date: Sat, 11 Dec 2010 18:36:06 +0000 (-0400)
Subject: prepend base.css to theme's style.css
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=44231a052fab0146185d7e291c36e54018c4b9cd;p=ikiwiki.git

prepend base.css to theme's style.css

this allows a theme to be built based on another
---

diff --git a/Makefile.PL b/Makefile.PL
index b28968417..7906f6593 100755
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -84,12 +84,15 @@ underlay_install:
 		fi \
 	done
 
-	# Themes have their style.css appended to the normal one.
+	# Themes have their base.css (if present) and then
+	# style.css appended to the normal one.
 	for theme in themes/*; do \
 		install -d $(DESTDIR)$(PREFIX)/share/ikiwiki/$$theme; \
 		for file in $$theme/*; do \
 			if echo "$$file" | grep -q style.css; then \
-				(cat doc/style.css; cat $$file) >> $(DESTDIR)$(PREFIX)/share/ikiwiki/$$theme/style.css; \
+				(cat doc/style.css; cat $$theme/base.css 2>/dev/null; cat $$file) >> $(DESTDIR)$(PREFIX)/share/ikiwiki/$$theme/style.css; \
+			elif echo "$$file" | grep -q base.css; then \
+				:; \
 			elif [ -f "$$file" ]; then \
 				cp -aL $$file $(DESTDIR)$(PREFIX)/share/ikiwiki/$$file 2>/dev/null || \
 				install -m 644 $$file $(DESTDIR)$(PREFIX)/share/ikiwiki/$$file; \