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

not work on FreeBSD.  Thanks to Henrik Brix Andersen for the patch.
master
joshtriplett 2007-04-29 21:53:26 +00:00
parent 8583fe7a95
commit e97b63c95a
3 changed files with 15 additions and 2 deletions

View File

@ -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

7
debian/changelog vendored
View File

@ -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 ]

View File

@ -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]]