]> sipb.mit.edu Git - ikiwiki.git/commitdiff
prepend base.css to theme's style.css
authorJoey Hess <joey@kitenet.net>
Sat, 11 Dec 2010 18:36:06 +0000 (14:36 -0400)
committerJoey Hess <joey@kitenet.net>
Sat, 11 Dec 2010 18:36:06 +0000 (14:36 -0400)
this allows a theme to be built based on another

Makefile.PL

index b28968417968ab175c7135f9aa45d619bce42e4a..7906f65934f5cf549b697c507b7321b7b97bafcb 100755 (executable)
@@ -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; \