From: Joey Hess Date: Sun, 3 Apr 2016 21:20:40 +0000 (-0400) Subject: check for fullstyle before style X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/34c0836dde06a55d05bb5088df6d015329f79488 check for fullstyle before style --- diff --git a/Makefile.PL b/Makefile.PL index f9c0cc96a..020bc5667 100755 --- a/Makefile.PL +++ b/Makefile.PL @@ -116,10 +116,10 @@ underlay_install: 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 $$theme/base.css 2>/dev/null; cat $$file) > $(DESTDIR)$(PREFIX)/share/ikiwiki/$$theme/style.css; \ - elif echo "$$file" | grep -q fullstyle.css; then \ + if echo "$$file" | grep -q fullstyle.css; then \ cp $$file $(DESTDIR)$(PREFIX)/share/ikiwiki/$$theme/style.css; \ + elif echo "$$file" | grep -q style.css; then \ + (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 \