(no commit message)

[git.ikiwiki.info.git] / Makefile.PL

diff --git a/Makefile.PL b/Makefile.PL
index 907ff30c9159c4b316dc31029d16693e60435b4e..bd630373bade00aeccfcdd5555b59ccd4fec87b8 100755 (executable)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -61,7 +61,7 @@ extra_build: perl_shebangs $(outprogs) ikiwiki.setup docwiki sysconfdir
 docwiki:
        $(PERL) -Iblib/lib $(extramodules) $(tflag) ikiwiki.in --setup docwiki.setup --refresh
 
-perl_shebangs:
+perl_shebangs: pm_to_blib
 ifneq "$(PERL)" "/usr/bin/perl"
        set -e; \
        for file in $(shebang_scripts); do \
@@ -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; \