Avoid unexpected full paths from find(1).

diff --git a/Makefile.PL b/Makefile.PL
index 6f1724697a938537cd224dcd869bd17d8a7fb05b..bd630373bade00aeccfcdd5555b59ccd4fec87b8 100755 (executable)
--- 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 b71bb8b91bd1d2d68dce77fe2f2a44339ef3fd70..bd218c6e19352b02b77e5a0cedb32040077062dd 100644 (file)
--- 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; \