* Avoid using GNU extensions to cp during "make install", which did

  not work on FreeBSD.  Thanks to Henrik Brix Andersen for the patch.

diff --git a/Makefile.PL b/Makefile.PL
index 676ba06ef94d7e25e7dbb97fd0a6f140bc1d89f2..43af95c59c4916ffaf8196c581b905c499dba154 100755 (executable)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -47,8 +47,12 @@ extra_clean:
 
 extra_install:
        install -d $(DESTDIR)$(PREFIX)/share/ikiwiki
-       find basewiki templates \( -type f -or -type l \) ! -regex '.*\.svn.*' \
-               -exec cp --parents -aL {} $(DESTDIR)$(PREFIX)/share/ikiwiki \;
+       for dir in `find -L basewiki templates -type d ! -regex '.*\.svn.*'`; do \
+               install -d $(DESTDIR)$(PREFIX)/share/ikiwiki/$$dir; \
+               for file in `find -L $$dir -maxdepth 1 -type f`; do \
+                       install -m 644 $$file $(DESTDIR)$(PREFIX)/share/ikiwiki/$$dir; \
+               done; \
+       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 de7eae4cf1c8306e3918caa68142e958c3227fb3..91c4da6b33482f762cb7be30fd94133853460c46 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ikiwiki (1.52) UNRELEASED; urgency=low
+
+  * Avoid using GNU extensions to cp during "make install", which did
+    not work on FreeBSD.  Thanks to Henrik Brix Andersen for the patch.
+
+ -- Josh Triplett <josh@freedesktop.org>  Sun, 29 Apr 2007 15:23:00 -0700
+
 ikiwiki (1.51) unstable; urgency=low
 
   [ Joey Hess ]

diff --git a/doc/bugs/Use_install__40__1__41___instead_of_cp__40__1__41___for_installing_files.mdwn b/doc/bugs/Use_install__40__1__41___instead_of_cp__40__1__41___for_installing_files.mdwn
index 1db357442be2245e3a1d73f7f56fcbc017a3f730..88a187dfc220a1d5a2f8a6bc1f186df184352fa1 100644 (file)
--- a/doc/bugs/Use_install__40__1__41___instead_of_cp__40__1__41___for_installing_files.mdwn
+++ b/doc/bugs/Use_install__40__1__41___instead_of_cp__40__1__41___for_installing_files.mdwn
@@ -23,3 +23,5 @@ Here is a patch against ikiwiki-1.51 for using find(1) and install(1) instead of
 > Couldn't it just use install -D ? --[[Joey]]
 
 >> No, apparently FreeBSD `install` does not support `-D`.  See [the FreeBSD install manpage](http://www.freebsd.org/cgi/man.cgi?query=install&apropos=0&sektion=0&manpath=FreeBSD+6.2-RELEASE&format=html). --[[JoshTriplett]]
+
+>> Patch applied; [[bugs/done]]. --[[JoshTriplett]]