From: HenrikBrixAndersen Date: Sat, 16 Aug 2008 13:09:47 +0000 (-0400) Subject: Add proposed patch X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/commitdiff_plain/6f70b295066aa8aa53b1a753179a76ed1cf0f1aa Add proposed patch --- diff --git a/doc/bugs/Please_avoid_using___39__cp_-a__39___in_Makefile.PL.mdwn b/doc/bugs/Please_avoid_using___39__cp_-a__39___in_Makefile.PL.mdwn index cd5fb5dcd..08dff9536 100644 --- a/doc/bugs/Please_avoid_using___39__cp_-a__39___in_Makefile.PL.mdwn +++ b/doc/bugs/Please_avoid_using___39__cp_-a__39___in_Makefile.PL.mdwn @@ -53,5 +53,23 @@ Please restore the old behaviour of using 'install' :-) >> [[todo/assumes_system_perl|todo/assumes_system_perl]]. >> --ChapmanFlack +>>> Joey: How about the following patch, then? -- [[HenrikBrixAndersen]] - + --- Makefile.PL.orig 2008-08-16 14:57:00.000000000 +0200 + +++ Makefile.PL 2008-08-16 15:03:45.000000000 +0200 + @@ -67,9 +67,12 @@ extra_install: + done + + install -d $(DESTDIR)$(PREFIX)/lib/ikiwiki/plugins + - for file in `find plugins -maxdepth 1 -type f ! -wholename plugins/.\* | grep -v demo`; do \ + - cp -a $$file $(DESTDIR)$(PREFIX)/lib/ikiwiki/plugins; \ + - done \ + + for file in `find plugins -maxdepth 1 -type f ! -wholename 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`; do \ + + install -m 755 $$file $(DESTDIR)$(PREFIX)/lib/ikiwiki/plugins; \ + + done + + install -d $(DESTDIR)$(PREFIX)/share/man/man1 + install -m 644 ikiwiki.man $(DESTDIR)$(PREFIX)/share/man/man1/ikiwiki.1