diff options
| author | Amitai Schleier <schmonz-web-ikiwiki@schmonz.com> | 2018-03-02 14:13:05 -0500 |
|---|---|---|
| committer | Amitai Schleier <schmonz-web-ikiwiki@schmonz.com> | 2018-03-02 14:13:05 -0500 |
| commit | 5051e1ae8149c28df2b2316fbe0923ba7d480035 (patch) | |
| tree | 242bf160e8bbac2cb4f85075d263197a6bdbe863 | |
| parent | 5ee60968b966f605eb3b0c3119e5366e57b745b8 (diff) | |
| download | ikiwiki-5051e1ae8149c28df2b2316fbe0923ba7d480035.tar ikiwiki-5051e1ae8149c28df2b2316fbe0923ba7d480035.tar.gz | |
Avoid unexpected full paths from find(1).
| -rwxr-xr-x | Makefile.PL | 6 | ||||
| -rw-r--r-- | po/Makefile | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Makefile.PL b/Makefile.PL index 6f1724697..bd630373b 100755 --- a/Makefile.PL +++ b/Makefile.PL @@ -96,7 +96,7 @@ myclean: clean underlay_install: install -d $(DESTDIR)$(PREFIX)/share/ikiwiki set -e; \ - for dir in `cd underlays && $(FIND) . -follow -type d`; do \ + for dir in `$(FIND) underlays -follow -mindepth 1 -type d | $(SED) -e 's|^underlays/||'`; do \ install -d $(DESTDIR)$(PREFIX)/share/ikiwiki/$$dir; \ for file in `$(FIND) underlays/$$dir -follow -maxdepth 1 -type f ! -name jquery.js ! -name jquery-ui.css ! -name jquery-ui.js ! -name jquery.tmpl.js`; do \ if ! cp -pRL $$file $(DESTDIR)$(PREFIX)/share/ikiwiki/$$dir 2>/dev/null; then \ @@ -137,11 +137,11 @@ underlay_install: extra_install: underlay_install # Install example sites. set -e; \ - for dir in `cd doc/examples; $(FIND) . -type d ! -regex '.*discussion.*'`; do \ + for dir in `$(FIND) doc/examples -type d ! -regex '.*discussion.*' | $(SED) -e 's|^doc/examples/||'`; do \ install -d $(DESTDIR)$(PREFIX)/share/ikiwiki/examples/$$dir; \ done set -e; \ - for file in `cd doc/examples; $(FIND) . -type f ! -regex '.*discussion.*'`; do \ + for file in `$(FIND) doc/examples -type f ! -regex '.*discussion.*' | $(SED) -e 's|^doc/examples/||'`; do \ if ! cp -pRL doc/examples/$$file $(DESTDIR)$(PREFIX)/share/ikiwiki/examples/$$file 2>/dev/null; then \ install -m 644 doc/examples/$$file $(DESTDIR)$(PREFIX)/share/ikiwiki/examples/$$file; \ fi; \ diff --git a/po/Makefile b/po/Makefile index b71bb8b91..bd218c6e1 100644 --- a/po/Makefile +++ b/po/Makefile @@ -22,7 +22,7 @@ install: all # Underlay translation via po files that go in special per-language # underlays. - for file in `cd underlays && find . -type f -name \*.po`; do \ + for file in `find underlays -type f -name \*.po | sed -e 's|^underlays/||'`; do \ lang=`echo $$file | sed -e 's/.po$$//' -e 's/.*\\.//'`; \ dir=`dirname "$(DESTDIR)$(PREFIX)/share/ikiwiki/po/$$lang/$$file"`; \ install -d $$dir; \ |