Escape HTML in Atom feed metadata rather than treating it as XHTML

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

diff --git a/Makefile.PL b/Makefile.PL
index cfaa6e6cda31701b03fd8edb15cc48ff4e21fdad..8c7ac70190ad26eba142abe79bb3a703036dd27e 100755 (executable)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -23,26 +23,26 @@ PROBABLE_INST_LIB=$(shell \\
        fi \\
 )
 
-tflag=$(shell if [ "$$NOTAINT" != 1 ]; then printf -- "-T"; fi)
-extramodules=$(shell if [ "$$PROFILE" = 1 ]; then printf -- "-MDevel::Profiler"; fi)
+tflag=$(shell if [ -n "$$NOTAINT" ] && [ "$$NOTAINT" != 1 ]; then printf -- "-T"; fi)
+extramodules=$(shell if [ "$$PROFILE" = 1 ]; then printf -- "-d:Profile"; fi)
 
 ikiwiki.out: ikiwiki.in
        ./pm_filter $(PREFIX) $(VER) $(PROBABLE_INST_LIB) < ikiwiki.in > ikiwiki.out
        chmod +x ikiwiki.out
 
 extra_build: ikiwiki.out
-       perl -Iblib/lib $(extramodules) $(tflag) ikiwiki.out -setup docwiki.setup -refresh
+       $(PERL) -Iblib/lib $(extramodules) $(tflag) ikiwiki.out -libdir . -setup docwiki.setup -refresh
        ./mdwn2man ikiwiki 1 doc/usage.mdwn > ikiwiki.man
        ./mdwn2man ikiwiki-mass-rebuild 8 doc/ikiwiki-mass-rebuild.mdwn > ikiwiki-mass-rebuild.man
        ./mdwn2man ikiwiki-makerepo 1 doc/ikiwiki-makerepo.mdwn > ikiwiki-makerepo.man
        ./mdwn2man ikiwiki-transition 1 doc/ikiwiki-transition.mdwn > ikiwiki-transition.man
        ./mdwn2man ikiwiki-update-wikilist 1 doc/ikiwiki-update-wikilist.mdwn > ikiwiki-update-wikilist.man
-       $(MAKE) -C po
-       if [ "$$PROFILE" = 1 ]; then dprofpp; fi
+       $(MAKE) -C po mo
 
 extra_clean:
        rm -rf html doc/.ikiwiki
        rm -f *.man ikiwiki.out
+       rm -f plugins/*.pyc
        $(MAKE) -C po clean
 
 extra_install:
@@ -61,7 +61,7 @@ extra_install:
        done
        
        install -d $(DESTDIR)$(PREFIX)/lib/ikiwiki/plugins
-       for file in `find plugins -maxdepth 1 -type f`; do \
+       for file in `find plugins -maxdepth 1 -type f ! -wholename plugins/.\*`; do \
                install -m 755 $$file $(DESTDIR)$(PREFIX)/lib/ikiwiki/plugins; \
        done; \
 
@@ -100,7 +100,6 @@ WriteMakefile(
                'HTML::Template'        => 0,
                'HTML::Scrubber'        => 0,
                'CGI::FormBuilder'      => 3.02.02,
-               'Time::Duration'        => 0,
                'CGI::Session'          => 0,
                'Mail::Sendmail'        => 0,
                'HTML::Parser'          => 0,