urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

makefile portability patch 

from Thomas Keller, who explains:

1) find -wholename is not available on BSD / OSX (a nice rant about this
issue is here: http://fuhm.livejournal.com/1848.html)

2) cp -a is not available on BSD / OSX, there is an alternative install
call, but it might be cool to just shut up cp complaining about it... ;)

3) Two find calls have been missing the path argument.
master
Joey Hess 2009-02-04 21:08:03 -05:00
parent 6655fbb991
commit cc055d2c95
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Makefile.PL
View File

@ -57,7 +57,7 @@ extra_install:
for dir in `cd underlays && find . -follow -type d ! -regex '.*\.svn.*'`; do \ for dir in `cd underlays && find . -follow -type d ! -regex '.*\.svn.*'`; do \
install -d $(DESTDIR)$(PREFIX)/share/ikiwiki/$$dir; \ install -d $(DESTDIR)$(PREFIX)/share/ikiwiki/$$dir; \
for file in `find underlays/$$dir -follow -maxdepth 1 -type f`; do \ for file in `find underlays/$$dir -follow -maxdepth 1 -type f`; do \
cp -aL $$file $(DESTDIR)$(PREFIX)/share/ikiwiki/$$dir || \ cp -aL $$file $(DESTDIR)$(PREFIX)/share/ikiwiki/$$dir 2>/dev/null || \
install -m 644 $$file $(DESTDIR)$(PREFIX)/share/ikiwiki/$$dir; \ install -m 644 $$file $(DESTDIR)$(PREFIX)/share/ikiwiki/$$dir; \
done; \ done; \
done done
@ -71,11 +71,11 @@ extra_install:
done done
# Install example sites. # Install example sites.
for dir in `cd doc/examples; find -type d ! -regex '.*\.svn.*'`; do \ for dir in `cd doc/examples; find . -type d ! -regex '.*\.svn.*'`; do \
install -d $(DESTDIR)$(PREFIX)/share/ikiwiki/examples/$$dir; \ install -d $(DESTDIR)$(PREFIX)/share/ikiwiki/examples/$$dir; \
done done
for file in `cd doc/examples; find -type f ! -regex '.*\.svn.*'`; do \ for file in `cd doc/examples; find . -type f ! -regex '.*\.svn.*'`; do \
cp -aL doc/examples/$$file $(DESTDIR)$(PREFIX)/share/ikiwiki/examples/$$file || \ cp -aL doc/examples/$$file $(DESTDIR)$(PREFIX)/share/ikiwiki/examples/$$file 2>/dev/null || \
install -m 644 doc/examples/$$file $(DESTDIR)$(PREFIX)/share/ikiwiki/examples/$$file; \ install -m 644 doc/examples/$$file $(DESTDIR)$(PREFIX)/share/ikiwiki/examples/$$file; \
done done
@ -87,10 +87,10 @@ extra_install:
done done
install -d $(DESTDIR)$(PREFIX)/lib/ikiwiki/plugins install -d $(DESTDIR)$(PREFIX)/lib/ikiwiki/plugins
for file in `find plugins -maxdepth 1 -type f ! -wholename plugins/.\* ! -name \*demo\* -name \*.py`; do \ for file in `find plugins -maxdepth 1 -type f ! -path plugins/.\* ! -name \*demo\* -name \*.py`; do \
install -m 644 $$file $(DESTDIR)$(PREFIX)/lib/ikiwiki/plugins; \ install -m 644 $$file $(DESTDIR)$(PREFIX)/lib/ikiwiki/plugins; \
done done
for file in `find plugins -maxdepth 1 -type f ! -wholename plugins/.\* ! -name \*demo\* ! -name \*.py ! -name \*.pyc`; do \ for file in `find plugins -maxdepth 1 -type f ! -path plugins/.\* ! -name \*demo\* ! -name \*.py ! -name \*.pyc`; do \
install -m 755 $$file $(DESTDIR)$(PREFIX)/lib/ikiwiki/plugins; \ install -m 755 $$file $(DESTDIR)$(PREFIX)/lib/ikiwiki/plugins; \
done done