Makefile: use ikiwiki.setup

Makefile

@@ -15,7 +15,7 @@
 #
 
 wiki:
-	@ikiwiki --rebuild --exclude www . www
+	@ikiwiki --setup ikiwiki.setup
 
 deploy:
 	@rsync -avz --delete www/ blog:/var/sites/rhatto/www/

ikiwiki.setup

@@ -11,8 +11,8 @@ use IkiWiki::Setup::Standard {
   adminemail => 'rhatto@riseup.net',
 
 	# Be sure to customise these..
-  #srcdir => "/var/sites/rhatto/ikiwiki_src",
-  #destdir => "/var/sites/rhatto/ikiwiki",
+  srcdir => ".",
+  destdir => "www",
 
   url => "https://rhatto.sarava.org",
   cgiurl => "https://rhatto.sarava.org/ikiwiki.cgi",
@@ -108,6 +108,7 @@ use IkiWiki::Setup::Standard {
 	# To exclude files matching a regexp from processing. This adds to
 	# the default exclude list.
 	#exclude => qr/\.wav$/,
+	exclude => qr/www/,
 	# To change the extension used for generated html files.
 	#htmlext => 'htm',
 	# Time format (for strftime)