Avoid using cp -a (again). (HenrikBrixAndersen)

diff --git a/Makefile.PL b/Makefile.PL
index ac4ec2644b919c125b29b9b25496e3684959f930..fa0b8ba49dd7ca320028179b86300f604318de30 100755 (executable)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -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

diff --git a/debian/changelog b/debian/changelog
index fe0bbec12b91dcab5107358acbac070cd90211f0..d7ea6c1afac5de2e72828e96f28def525e394799 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ikiwiki (2.62) UNRELEASED; urgency=low
+
+  * Avoid using cp -a (again). (HenrikBrixAndersen)
+
+ -- Joey Hess <joeyh@debian.org>  Thu, 21 Aug 2008 16:20:58 -0400
+
 ikiwiki (2.61) unstable; urgency=low
 
   * poll: Fix typo that broke plugin.

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 08dff9536d138c2296f8633111da61b2d7e4a22e..07d5efeaddd2c94ad92734ac2e5aaa91bfef66a9 100644 (file)
--- 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
@@ -73,3 +73,5 @@ Please restore the old behaviour of using 'install' :-)
      
        install -d $(DESTDIR)$(PREFIX)/share/man/man1
        install -m 644 ikiwiki.man $(DESTDIR)$(PREFIX)/share/man/man1/ikiwiki.1
+
+[[tag done]]