X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/ddef0d3170b1543e6ed580c7ce00849e3ed1550f..029edd9b45d2bfd5c9b2fff5aab1d6d70d3d39ab:/Makefile.PL

diff --git a/Makefile.PL b/Makefile.PL
index 04ed70502..1fc0bf371 100755
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -33,14 +33,16 @@ ikiwiki.out: ikiwiki.in
 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
+extra_build: ikiwiki.out ikiwiki.setup docwiki
 	./mdwn2man ikiwiki 1 doc/usage.mdwn > ikiwiki.man
 	./mdwn2man ikiwiki-mass-rebuild 8 doc/ikiwiki-mass-rebuild.mdwn > ikiwiki-mass-rebuild.man
 	./mdwn2man ikiwiki-makerepo 1 doc/ikiwiki-makerepo.mdwn > ikiwiki-makerepo.man
 	./mdwn2man ikiwiki-transition 1 doc/ikiwiki-transition.mdwn > ikiwiki-transition.man
 	./mdwn2man ikiwiki-update-wikilist 1 doc/ikiwiki-update-wikilist.mdwn > ikiwiki-update-wikilist.man
 	$(MAKE) -C po mo
+	
+docwiki: ikiwiki.out
+	$(PERL) -Iblib/lib $(extramodules) $(tflag) ikiwiki.out -libdir . -setup docwiki.setup -refresh
 
 extra_clean:
 	rm -rf html doc/.ikiwiki
@@ -50,7 +52,7 @@ extra_clean:
 extra_install:
 	install -d $(DESTDIR)/etc/ikiwiki
 	install -m 0644 wikilist $(DESTDIR)/etc/ikiwiki
-	install -m 0644 simple.setup $(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 \
@@ -67,9 +69,12 @@ extra_install:
 	done
 	
 	install -d $(DESTDIR)$(PREFIX)/lib/ikiwiki/plugins
-	for file in `find plugins -maxdepth 1 -type f ! -wholename plugins/.\*`; do \
-		cp -a $$file $(DESTDIR)$(PREFIX)/lib/ikiwiki/plugins; \
-	done; \
+	for file in `find plugins -maxdepth 1 -type f ! -wholename plugins/.\* ! -name \*demo\* -name \*.py`; do \
+		install -m 644 $$file $(DESTDIR)$(PREFIX)/lib/ikiwiki/plugins; \
+	done
+	for file in `find plugins -maxdepth 1 -type f ! -wholename plugins/.\* ! -name \*demo\* ! -name \*.py`; do \
+		install -m 755 $$file $(DESTDIR)$(PREFIX)/lib/ikiwiki/plugins; \
+	done
 
 	install -d $(DESTDIR)$(PREFIX)/share/man/man1
 	install -m 644 ikiwiki.man $(DESTDIR)$(PREFIX)/share/man/man1/ikiwiki.1