]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commitdiff
check for fullstyle before style
authorJoey Hess <joeyh@joeyh.name>
Sun, 3 Apr 2016 21:20:40 +0000 (17:20 -0400)
committerJoey Hess <joeyh@joeyh.name>
Sun, 3 Apr 2016 21:20:40 +0000 (17:20 -0400)
Makefile.PL

index f9c0cc96a3f7d8b7308e0a4af8deb40b7eae0132..020bc56678925f0b99192d064110d0069530cda0 100755 (executable)
@@ -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 \