resolve conflict

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

diff --git a/Makefile.PL b/Makefile.PL
index d29804ccaba91ca3af1fe2b4f8d6dd0a874c0043..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
@@ -42,7 +42,7 @@ extra_build: ikiwiki.out ikiwiki.setup docwiki
        ./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 mo
+       $(MAKE) -C po
        
 docwiki: ikiwiki.out
        $(PERL) -Iblib/lib $(extramodules) $(tflag) ikiwiki.out -libdir . -setup docwiki.setup -refresh
@@ -52,12 +52,12 @@ extra_clean:
        rm -f *.man ikiwiki.out ikiwiki.setup plugins/*.pyc
        $(MAKE) -C po clean
 
-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; \
                for file in `find underlays/$$dir -follow -maxdepth 1 -type f`; do \
-                       cp -aL $$file $(DESTDIR)$(PREFIX)/share/ikiwiki/$$dir || \
+                       cp -aL $$file $(DESTDIR)$(PREFIX)/share/ikiwiki/$$dir 2>/dev/null || \
                        install -m 644 $$file $(DESTDIR)$(PREFIX)/share/ikiwiki/$$dir; \
                done; \
        done
@@ -70,12 +70,13 @@ extra_install:
                fi \
        done
        
+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 '.*\.svn.*'`; do \
                install -d $(DESTDIR)$(PREFIX)/share/ikiwiki/examples/$$dir; \
        done
-       for file in `cd doc/examples; find -type f ! -regex '.*\.svn.*'`; do \
-               cp -aL doc/examples/$$file $(DESTDIR)$(PREFIX)/share/ikiwiki/examples/$$file || \
+       for file in `cd doc/examples; find . -type f ! -regex '.*\.svn.*'`; 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
 
@@ -87,10 +88,10 @@ extra_install:
        done
        
        install -d $(DESTDIR)$(PREFIX)/lib/ikiwiki/plugins
-       for file in `find plugins -maxdepth 1 -type f ! -wholename plugins/.\* ! -name \*demo\* -name \*.py`; do \
+       for file in `find plugins -maxdepth 1 -type f ! -path plugins/.\* ! -name \*demo\* -name \*.py`; do \
                install -m 644 $$file $(DESTDIR)$(PREFIX)/lib/ikiwiki/plugins; \
        done
-       for file in `find plugins -maxdepth 1 -type f ! -wholename plugins/.\* ! -name \*demo\* ! -name \*.py ! -name \*.pyc`; do \
+       for file in `find plugins -maxdepth 1 -type f ! -path plugins/.\* ! -name \*demo\* ! -name \*.py ! -name \*.pyc`; do \
                install -m 755 $$file $(DESTDIR)$(PREFIX)/lib/ikiwiki/plugins; \
        done
 
@@ -130,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",
        },
 );