X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/fd6d85aa7995d90956d1ddc95b7d7517f5ccd470..7861b38e1c12ca02de7535add4938802182762b4:/Makefile.PL?ds=sidebyside

diff --git a/Makefile.PL b/Makefile.PL
index 0315b6d49..6162743f3 100755
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -23,7 +23,7 @@ PROBABLE_INST_LIB=$(shell \\
 	fi \\
 )
 
-tflag=$(shell if [ "$$NOTAINT" != 0 ]; then printf -- "-T"; fi)
+tflag=$(shell if [ -n "$$NOTAINT" ] && [ "$$NOTAINT" != 1 ]; then printf -- "-T"; fi)
 extramodules=$(shell if [ "$$PROFILE" = 1 ]; then printf -- "-MDevel::Profiler"; fi)
 
 ikiwiki.out: ikiwiki.in
@@ -31,15 +31,11 @@ ikiwiki.out: ikiwiki.in
 	chmod +x ikiwiki.out
 
 extra_build: ikiwiki.out
-	LANG= perl -Iblib/lib $(extramodules) $(tflag) ikiwiki.out doc html --templatedir=templates \
-		--underlaydir=underlays/basewiki --nousedirs\
-		--wikiname="ikiwiki" --verbose \
-		--exclude=/discussion --no-discussion --userdir=users \
-		--plugin=goodstuff --plugin=version \
-		--plugin=haiku --plugin=polygen --plugin=fortune
+	perl -Iblib/lib $(extramodules) $(tflag) ikiwiki.out -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
 	./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
 	if [ "$$PROFILE" = 1 ]; then dprofpp; fi
@@ -72,6 +68,7 @@ extra_install:
 	install -d $(DESTDIR)$(PREFIX)/share/man/man1
 	install -m 644 ikiwiki.man $(DESTDIR)$(PREFIX)/share/man/man1/ikiwiki.1
 	install -m 644 ikiwiki-makerepo.man $(DESTDIR)$(PREFIX)/share/man/man1/ikiwiki-makerepo.1
+	install -m 644 ikiwiki-transition.man $(DESTDIR)$(PREFIX)/share/man/man1/ikiwiki-transition.1
 	install -m 644 ikiwiki-update-wikilist.man $(DESTDIR)$(PREFIX)/share/man/man1/ikiwiki-update-wikilist.1
 	
 	install -d $(DESTDIR)$(PREFIX)/share/man/man8
@@ -85,7 +82,7 @@ extra_install:
 
 	install -d $(DESTDIR)$(PREFIX)/bin
 	install ikiwiki.out $(DESTDIR)$(PREFIX)/bin/ikiwiki
-	install ikiwiki-makerepo ikiwiki-update-wikilist $(DESTDIR)$(PREFIX)/bin/
+	install ikiwiki-makerepo ikiwiki-transition ikiwiki-update-wikilist $(DESTDIR)$(PREFIX)/bin/
 
 	$(MAKE) -C po install DESTDIR=$(DESTDIR) PREFIX=$(PREFIX)
 }
@@ -108,5 +105,6 @@ WriteMakefile(
 		'Mail::Sendmail'	=> 0,
 		'HTML::Parser'		=> 0,
 		'URI'			=> 0,
+		'Data::Dumper'		=> 2.11,
 	},
 );