resolve conflict

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

diff --git a/Makefile.PL b/Makefile.PL
index b2d027bc4d8843d592e395d82f3073783bbea510..0208131770ccc110ea306dc9be0bb45afe6ee98e 100755 (executable)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -27,7 +27,7 @@ PROBABLE_INST_LIB=$(shell \\
 W3M_CGI_BIN?=$(PREFIX)/lib/w3m/cgi-bin
 
 tflag=$(shell if [ -n "$$NOTAINT" ] && [ "$$NOTAINT" != 1 ]; then printf -- "-T"; fi)
-extramodules=$(shell if [ "$$PROFILE" = 1 ]; then printf -- "-d:Profile"; fi)
+extramodules=$(shell if [ "$$PROFILE" = 1 ]; then printf -- "-d:NYTProf"; fi)
 
 ikiwiki.out: ikiwiki.in
        ./pm_filter $(PREFIX) $(VER) $(PROBABLE_INST_LIB) < ikiwiki.in > ikiwiki.out
@@ -47,30 +47,12 @@ extra_build: ikiwiki.out ikiwiki.setup docwiki
 docwiki: ikiwiki.out
        $(PERL) -Iblib/lib $(extramodules) $(tflag) ikiwiki.out -libdir . -setup docwiki.setup -refresh
 
-underlaypo: ikiwiki.out
-       # copy all the files we want to translate into the
-       # po/underlays scrdir.
-       for file in `find underlays -follow -name \*.mdwn`; do \
-               install -d po/$$(dirname $$file); \
-               cp -aL $$file po/$$file 2>/dev/null || \
-               install -m 644 $$file po/$$file; \
-       done
-       install -d po/underlays/directives/ikiwiki/directive
-       for file in doc/ikiwiki/directive/*; do \
-               if [ -f "$$file" ]; then \
-                       install -m 644 $$file po/underlays/directives/ikiwiki/directive; \
-               fi \
-       done
-       $(PERL) -Iblib/lib $(extramodules) $(tflag) ikiwiki.out -libdir . -setup underlaypo.setup -refresh
-       find po/underlays -name \*.mdwn | xargs rm -f
-
 extra_clean:
        rm -rf html doc/.ikiwiki
        rm -f *.man ikiwiki.out ikiwiki.setup plugins/*.pyc
        $(MAKE) -C po clean
-       rm -rf po/html po/underlays/.ikiwiki
 
-extra_install:
+underlay_install:
        install -d $(DESTDIR)$(PREFIX)/share/ikiwiki
        for dir in `cd underlays && find . -follow -type d ! -regex '.*\.svn.*'`; do \
                install -d $(DESTDIR)$(PREFIX)/share/ikiwiki/$$dir; \
@@ -88,6 +70,7 @@ extra_install:
                fi \
        done
        
+extra_install: underlay_install
        # Install example sites.
        for dir in `cd doc/examples; find . -type d ! -regex '.*\.svn.*'`; do \
                install -d $(DESTDIR)$(PREFIX)/share/ikiwiki/examples/$$dir; \
@@ -148,16 +131,16 @@ WriteMakefile(
        PM_FILTER       => './pm_filter $(PREFIX) $(VER) $(PROBABLE_INST_LIB)',
        MAN1PODS        => {},
        PREREQ_PM       => {
-               'XML::Simple'           => 0,
-               'Text::Markdown'        => 0,
-               'Date::Parse'           => 0,
-               'HTML::Template'        => 0,
-               'HTML::Scrubber'        => 0,
-               'CGI::FormBuilder'      => 3.02.02,
-               'CGI::Session'          => 0,
-               'Mail::Sendmail'        => 0,
-               'HTML::Parser'          => 0,
-               'URI'                   => 0,
-               'Data::Dumper'          => 2.11,
+               'XML::Simple'           => "0",
+               'Text::Markdown'        => "0",
+               'Date::Parse'           => "0",
+               'HTML::Template'        => "0",
+               'HTML::Scrubber'        => "0",
+               'CGI::FormBuilder'      => "3.02.02",
+               'CGI::Session'          => "0",
+               'Mail::Sendmail'        => "0",
+               'HTML::Parser'          => "0",
+               'URI'                   => "0",
+               'Data::Dumper'          => "2.11",
        },
 );