diff options
| author | intrigeri <intrigeri@boum.org> | 2009-03-08 09:50:27 +0100 |
|---|---|---|
| committer | intrigeri <intrigeri@boum.org> | 2009-03-08 09:50:27 +0100 |
| commit | ae474d8e14631ff519ed7d54bb64eaa0538f56d9 (patch) | |
| tree | 09637db5faf2632b67b581cf04463fe4493584d4 /Makefile.PL | |
| parent | 0314ed459ba1c49fad9170a54cc05f1c9e9c96bf (diff) | |
| parent | 08e4472fc469c630ebef93e16a66a5a69d9cb33a (diff) | |
| download | ikiwiki-ae474d8e14631ff519ed7d54bb64eaa0538f56d9.tar ikiwiki-ae474d8e14631ff519ed7d54bb64eaa0538f56d9.tar.gz | |
Merge commit 'upstream/master' into prv/po
Conflicts:
IkiWiki/Plugin/editpage.pm
debian/control
debian/copyright
doc/todo/need_global_renamepage_hook.mdwn
Signed-off-by: intrigeri <intrigeri@boum.org>
Diffstat (limited to 'Makefile.PL')
| -rwxr-xr-x | Makefile.PL | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/Makefile.PL b/Makefile.PL index d29804cca..93f9e89e2 100755 --- a/Makefile.PL +++ b/Makefile.PL @@ -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 @@ -57,7 +57,7 @@ extra_install: 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 @@ -71,11 +71,11 @@ extra_install: done # 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 +87,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 |