X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/e837a226d6bdbbe4a8b02a45b663552e2904adb7..eb7992de16a387351bc7af0af3da69e31555d3c4:/Makefile.PL?ds=sidebyside diff --git a/Makefile.PL b/Makefile.PL index df677262b..b19636c60 100755 --- a/Makefile.PL +++ b/Makefile.PL @@ -67,9 +67,9 @@ myclean: clean underlay_install: install -d $(DESTDIR)$(PREFIX)/share/ikiwiki - for dir in `cd underlays && $(FIND) . -follow -type d ! -regex '.*\.svn.*'`; do \ + for dir in `cd underlays && $(FIND) . -follow -type d`; do \ install -d $(DESTDIR)$(PREFIX)/share/ikiwiki/$$dir; \ - for file in `$(FIND) underlays/$$dir -follow -maxdepth 1 -type f`; do \ + for file in `$(FIND) underlays/$$dir -follow -maxdepth 1 -type f -not -name \\*.full.js -not -name \\*.full.css`; do \ cp -aL $$file $(DESTDIR)$(PREFIX)/share/ikiwiki/$$dir 2>/dev/null || \ install -m 644 $$file $(DESTDIR)$(PREFIX)/share/ikiwiki/$$dir; \ done; \ @@ -102,15 +102,15 @@ underlay_install: extra_install: underlay_install # Install example sites. - for dir in `cd doc/examples; $(FIND) . -type d ! -regex '.*\.svn.*'`; do \ + for dir in `cd doc/examples; $(FIND) . -type d ! -regex '.*discussion.*'`; do \ install -d $(DESTDIR)$(PREFIX)/share/ikiwiki/examples/$$dir; \ done - for file in `cd doc/examples; $(FIND) . -type f ! -regex '.*\.svn.*'`; do \ + for file in `cd doc/examples; $(FIND) . -type f ! -regex '.*discussion.*'`; do \ cp -aL doc/examples/$$file $(DESTDIR)$(PREFIX)/share/ikiwiki/examples/$$file 2>/dev/null || \ install -m 644 doc/examples/$$file $(DESTDIR)$(PREFIX)/share/ikiwiki/examples/$$file; \ done - for dir in `$(FIND) templates -follow -type d ! -regex '.*\.svn.*'`; do \ + for dir in `$(FIND) templates -follow -type d`; do \ install -d $(DESTDIR)$(PREFIX)/share/ikiwiki/$$dir; \ for file in `$(FIND) $$dir -follow -maxdepth 1 -type f`; do \ install -m 644 $$file $(DESTDIR)$(PREFIX)/share/ikiwiki/$$dir; \ @@ -154,6 +154,13 @@ extra_install: underlay_install -install -m 0644 wikilist $(DESTDIR)/etc/ikiwiki -install -m 0644 auto.setup $(DESTDIR)/etc/ikiwiki -install -m 0644 auto-blog.setup $(DESTDIR)/etc/ikiwiki + +# The git/hg plugins want to chdir; so does Devel::Cover. Skip those tests +# to stop them hurting each other. +coverage: + cover -delete + $(MAKE) test PERL5OPT=-MDevel::Cover PERL5LIB=. TEST_FILES="$(filter-out t/git.t t/mercurial.t,$(wildcard t/*.t))" + cover } }