summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xMakefile.PL8
-rw-r--r--debian/changelog7
-rw-r--r--doc/bugs/Use_install__40__1__41___instead_of_cp__40__1__41___for_installing_files.mdwn2
3 files changed, 15 insertions, 2 deletions
diff --git a/Makefile.PL b/Makefile.PL
index 676ba06ef..43af95c59 100755
--- 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 de7eae4cf..91c4da6b3 100644
--- 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 1db357442..88a187dfc 100644
--- 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]]