comments: add avatar picture of comment author

[git.ikiwiki.info.git] / Makefile.PL

diff --git a/Makefile.PL b/Makefile.PL
index b28968417968ab175c7135f9aa45d619bce42e4a..df677262b367b4a6ba4884f7cb51ec12f0278f3f 100755 (executable)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -50,7 +50,7 @@ extra_build: $(outprogs) ikiwiki.setup docwiki
        ./mdwn2man ikiwiki-update-wikilist 1 doc/ikiwiki-update-wikilist.mdwn > ikiwiki-update-wikilist.man
        ./mdwn2man ikiwiki-calendar 1 doc/ikiwiki-calendar.mdwn > ikiwiki-calendar.man
        $(MAKE) -C po
-       $(SED) -i.bkp "s/Version:.*/Version: $$(perl -e '$$_=<>;print m/\((.*?)\)/'<debian/changelog)/" ikiwiki.spec
+       $(SED) -i.bkp "s/Version:.*/Version: $(VER)/" ikiwiki.spec
        rm -f ikiwiki.spec.bkp
        
 docwiki:
@@ -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; \