Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info

[ikiwiki.git] / Makefile.PL

diff --git a/Makefile.PL b/Makefile.PL
index 559c6d9ead457a4e443c45979e60c0c575c58dca..ac4ec2644b919c125b29b9b25496e3684959f930 100755 (executable)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -30,8 +30,10 @@ ikiwiki.out: ikiwiki.in
        ./pm_filter $(PREFIX) $(VER) $(PROBABLE_INST_LIB) < ikiwiki.in > ikiwiki.out
        chmod +x ikiwiki.out
 
-extra_build: ikiwiki.out
-       $(PERL) -Iblib/lib $(extramodules) $(tflag) ikiwiki.out -libdir . -dumpsetup ikiwiki.setup
+ikiwiki.setup: ikiwiki.out
+       HOME=/home/me $(PERL) -Iblib/lib $(extramodules) $(tflag) ikiwiki.out -libdir . -dumpsetup ikiwiki.setup
+
+extra_build: ikiwiki.out ikiwiki.setup
        $(PERL) -Iblib/lib $(extramodules) $(tflag) ikiwiki.out -libdir . -setup docwiki.setup -refresh
        ./mdwn2man ikiwiki 1 doc/usage.mdwn > ikiwiki.man
        ./mdwn2man ikiwiki-mass-rebuild 8 doc/ikiwiki-mass-rebuild.mdwn > ikiwiki-mass-rebuild.man
@@ -46,6 +48,10 @@ extra_clean:
        $(MAKE) -C po clean
 
 extra_install:
+       install -d $(DESTDIR)/etc/ikiwiki
+       install -m 0644 wikilist $(DESTDIR)/etc/ikiwiki
+       install -m 0644 auto.setup $(DESTDIR)/etc/ikiwiki
+
        install -d $(DESTDIR)$(PREFIX)/share/ikiwiki
        for dir in `cd underlays && find . -follow -type d ! -regex '.*\.svn.*'`; do \
                install -d $(DESTDIR)$(PREFIX)/share/ikiwiki/$$dir; \
@@ -61,9 +67,9 @@ extra_install:
        done
        
        install -d $(DESTDIR)$(PREFIX)/lib/ikiwiki/plugins
-       for file in `find plugins -maxdepth 1 -type f ! -wholename plugins/.\*`; do \
+       for file in `find plugins -maxdepth 1 -type f ! -wholename plugins/.\* | grep -v demo`; do \
                cp -a $$file $(DESTDIR)$(PREFIX)/lib/ikiwiki/plugins; \
-       done; \
+       done \
 
        install -d $(DESTDIR)$(PREFIX)/share/man/man1
        install -m 644 ikiwiki.man $(DESTDIR)$(PREFIX)/share/man/man1/ikiwiki.1