X-Git-Url: http://git.tremily.us/?p=ikiwiki.git;a=blobdiff_plain;f=Makefile.PL;h=4001c841b8f79c9a98870f526f2553db615602ca;hp=93f9e89e2ab3314e6cc4ed85321c7168a3f1f67d;hb=937b24e0cf98d75dd353d80267efddcecab9e908;hpb=8e92468eae9ac0ab8161a0c71ff6c6a0a8aef07a

diff --git a/Makefile.PL b/Makefile.PL
index 93f9e89e2..4001c841b 100755
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -27,32 +27,41 @@ PROBABLE_INST_LIB=$(shell \\
 W3M_CGI_BIN?=$(PREFIX)/lib/w3m/cgi-bin
 
 tflag=$(shell if [ -n "$$NOTAINT" ] && [ "$$NOTAINT" != 1 ]; then printf -- "-T"; fi)
-extramodules=$(shell if [ "$$PROFILE" = 1 ]; then printf -- "-d:Profile"; fi)
+extramodules=$(shell if [ "$$PROFILE" = 1 ]; then printf -- "-d:NYTProf"; fi)
+outprogs=ikiwiki.out ikiwiki-transition.out ikiwiki-calendar.out
+scripts=ikiwiki-update-wikilist ikiwiki-makerepo
 
-ikiwiki.out: ikiwiki.in
-	./pm_filter $(PREFIX) $(VER) $(PROBABLE_INST_LIB) < ikiwiki.in > ikiwiki.out
-	chmod +x ikiwiki.out
+%.out: %.in
+	./pm_filter $(PREFIX) $(VER) $(PROBABLE_INST_LIB) < $< > $@
+	chmod +x $@
 
-ikiwiki.setup: ikiwiki.out
-	HOME=/home/me $(PERL) -Iblib/lib $(extramodules) $(tflag) ikiwiki.out -libdir . -dumpsetup ikiwiki.setup
+ikiwiki.setup:
+	HOME=/home/me $(PERL) -Iblib/lib $(extramodules) $(tflag) ikiwiki.in -dumpsetup ikiwiki.setup
 
-extra_build: ikiwiki.out ikiwiki.setup docwiki
+extra_build: $(outprogs) 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
+	./mdwn2man ikiwiki-calendar 1 doc/ikiwiki-calendar.mdwn > ikiwiki-calendar.man
 	$(MAKE) -C po
+	sed -i.bkp "s/Version:.*/Version: $$(perl -e '$$_=<>;print m/\((.*?)\)/'<debian/changelog)/" ikiwiki.spec
+	rm -f ikiwiki.spec.bkp
 	
-docwiki: ikiwiki.out
-	$(PERL) -Iblib/lib $(extramodules) $(tflag) ikiwiki.out -libdir . -setup docwiki.setup -refresh
+docwiki:
+	$(PERL) -Iblib/lib $(extramodules) $(tflag) ikiwiki.in -setup docwiki.setup -refresh
 
 extra_clean:
-	rm -rf html doc/.ikiwiki
-	rm -f *.man ikiwiki.out ikiwiki.setup plugins/*.pyc
+	$(PERL) -Iblib/lib $(extramodules) $(tflag) ikiwiki.in -setup docwiki.setup -clean
+	rm -f *.man $(outprogs) ikiwiki.setup plugins/*.pyc
 	$(MAKE) -C po clean
 
-extra_install:
+# Joey uses this before committing.
+myclean: clean
+	git checkout po ikiwiki.spec
+
+underlay_install:
 	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; \
@@ -70,6 +79,7 @@ extra_install:
 		fi \
 	done
 	
+extra_install: underlay_install
 	# Install example sites.
 	for dir in `cd doc/examples; find . -type d ! -regex '.*\.svn.*'`; do \
 		install -d $(DESTDIR)$(PREFIX)/share/ikiwiki/examples/$$dir; \
@@ -99,6 +109,7 @@ extra_install:
 	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 -m 644 ikiwiki-calendar.man $(DESTDIR)$(PREFIX)/share/man/man1/ikiwiki-calendar.1
 	
 	install -d $(DESTDIR)$(PREFIX)/share/man/man8
 	install -m 644 ikiwiki-mass-rebuild.man $(DESTDIR)$(PREFIX)/share/man/man8/ikiwiki-mass-rebuild.8
@@ -110,8 +121,9 @@ extra_install:
 	install ikiwiki-w3m.cgi $(DESTDIR)$(W3M_CGI_BIN)
 
 	install -d $(DESTDIR)$(PREFIX)/bin
-	install ikiwiki.out $(DESTDIR)$(PREFIX)/bin/ikiwiki
-	install ikiwiki-makerepo ikiwiki-transition ikiwiki-update-wikilist $(DESTDIR)$(PREFIX)/bin/
+	for prog in $(outprogs) $(scripts); do \
+		install $$prog $(DESTDIR)$(PREFIX)/bin/$$(echo $$prog | sed 's/\.out//'); \
+	done
 
 	$(MAKE) -C po install DESTDIR=$(DESTDIR) PREFIX=$(PREFIX)
 	
@@ -130,16 +142,16 @@ WriteMakefile(
 	PM_FILTER	=> './pm_filter $(PREFIX) $(VER) $(PROBABLE_INST_LIB)',
 	MAN1PODS	=> {},
 	PREREQ_PM	=> {
-		'XML::Simple'		=> 0,
-		'Text::Markdown'	=> 0,
-		'Date::Parse'		=> 0,
-		'HTML::Template'	=> 0,
-		'HTML::Scrubber'	=> 0,
-		'CGI::FormBuilder'	=> 3.02.02,
-		'CGI::Session'		=> 0,
-		'Mail::Sendmail'	=> 0,
-		'HTML::Parser'		=> 0,
-		'URI'			=> 0,
-		'Data::Dumper'		=> 2.11,
+		'XML::Simple'		=> "0",
+		'Text::Markdown'	=> "0",
+		'Date::Parse'		=> "0",
+		'HTML::Template'	=> "0",
+		'HTML::Scrubber'	=> "0",
+		'CGI::FormBuilder'	=> "3.02.02",
+		'CGI::Session'		=> "0",
+		'Mail::Sendmail'	=> "0",
+		'HTML::Parser'		=> "0",
+		'URI'			=> "0",
+		'Data::Dumper'		=> "2.11",
 	},
 );