* Apply a patch from Carl Worth adding support for using globs in link()

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

diff --git a/Makefile.PL b/Makefile.PL
index 43af95c59c4916ffaf8196c581b905c499dba154..985c944ad4c97a265ffd6b4b4c5783edb884dfd0 100755 (executable)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -26,11 +26,13 @@ PROBABLE_INST_LIB=$(shell \\
 tflag=$(shell if [ "$$NOTAINT" != 0 ]; then printf -- "-T"; fi)
 extramodules=$(shell if [ "$$PROFILE" = 1 ]; then printf -- "-MDevel::Profiler"; fi)
 
 tflag=$(shell if [ "$$NOTAINT" != 0 ]; then printf -- "-T"; fi)
 extramodules=$(shell if [ "$$PROFILE" = 1 ]; then printf -- "-MDevel::Profiler"; fi)
 

-extra_build:
+ikiwiki.out: ikiwiki.in

        ./pm_filter $(PREFIX) $(VER) $(PROBABLE_INST_LIB) < ikiwiki.in > ikiwiki.out
        chmod +x ikiwiki.out
        ./pm_filter $(PREFIX) $(VER) $(PROBABLE_INST_LIB) < ikiwiki.in > ikiwiki.out
        chmod +x ikiwiki.out

+
+extra_build: ikiwiki.out

        LANG=C perl -I. $(extramodules) $(tflag) ikiwiki.out doc html --templatedir=templates \
        LANG=C perl -I. $(extramodules) $(tflag) ikiwiki.out doc html --templatedir=templates \

-               --underlaydir=basewiki \
+               --underlaydir=basewiki --nousedirs\

                --wikiname="ikiwiki" --verbose \
                --exclude=/discussion --no-discussion --userdir=users \
                --plugin=goodstuff \
                --wikiname="ikiwiki" --verbose \
                --exclude=/discussion --no-discussion --userdir=users \
                --plugin=goodstuff \


@@ -47,9 +49,9 @@ extra_clean:
 
 extra_install:
        install -d $(DESTDIR)$(PREFIX)/share/ikiwiki
 
 extra_install:
        install -d $(DESTDIR)$(PREFIX)/share/ikiwiki

-       for dir in `find -L basewiki templates -type d ! -regex '.*\.svn.*'`; do \
+       for dir in `find basewiki templates -follow -type d ! -regex '.*\.svn.*'`; do \

                install -d $(DESTDIR)$(PREFIX)/share/ikiwiki/$$dir; \
                install -d $(DESTDIR)$(PREFIX)/share/ikiwiki/$$dir; \

-               for file in `find -L $$dir -maxdepth 1 -type f`; do \
+               for file in `find $$dir -follow -maxdepth 1 -type f`; do \

                        install -m 644 $$file $(DESTDIR)$(PREFIX)/share/ikiwiki/$$dir; \
                done; \
        done
                        install -m 644 $$file $(DESTDIR)$(PREFIX)/share/ikiwiki/$$dir; \
                done; \
        done