summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joey@kodama.kitenet.net>2008-08-21 16:21:40 -0400
committerJoey Hess <joey@kodama.kitenet.net>2008-08-21 16:21:40 -0400
commitdec9b4e2c9eab4fd5cbd661eb475d96e9e5ca8c0 (patch)
tree0be610842022f8de519c14a044ec5eca6e4a0283
parentb12f29e4562e73e52c1a923c3c3b743b9bbc4ce2 (diff)
Avoid using cp -a (again). (HenrikBrixAndersen)
-rwxr-xr-xMakefile.PL9
-rw-r--r--debian/changelog6
-rw-r--r--doc/bugs/Please_avoid_using___39__cp_-a__39___in_Makefile.PL.mdwn2
3 files changed, 14 insertions, 3 deletions
diff --git a/Makefile.PL b/Makefile.PL
index ac4ec2644..fa0b8ba49 100755
--- 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 fe0bbec12..d7ea6c1af 100644
--- 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 08dff9536..07d5efead 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
@@ -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]]