diff options
| -rw-r--r-- | .gitignore | 3 | ||||
| -rwxr-xr-x | Makefile.PL | 16 | ||||
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | doc/bugs/ikiwiki-transition_does_not_set_perl_moduels_path_properly.mdwn | 2 | ||||
| -rwxr-xr-x | ikiwiki-calendar.in (renamed from ikiwiki-calendar) | 1 | ||||
| -rwxr-xr-x | ikiwiki-transition.in (renamed from ikiwiki-transition) | 1 | ||||
| -rw-r--r-- | ikiwiki.spec | 2 |
7 files changed, 18 insertions, 9 deletions
diff --git a/.gitignore b/.gitignore index 8de36e2c8..e9ab152b6 100644 --- a/.gitignore +++ b/.gitignore @@ -5,9 +5,10 @@ blib/* doc/.ikiwiki/* html/* ikiwiki.out +ikiwiki-transition.out +ikiwiki-calendar.out pm_to_blib *.man -build-stamp po/po2wiki_stamp po/underlays/*/*.mdwn po/underlays/basewiki/*/*.mdwn diff --git a/Makefile.PL b/Makefile.PL index 52421a711..5a9028b51 100755 --- a/Makefile.PL +++ b/Makefile.PL @@ -28,15 +28,16 @@ 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:NYTProf"; fi) +outprogs=ikiwiki.out ikiwiki-transition.out ikiwiki-calendar.out -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 -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 @@ -52,7 +53,7 @@ docwiki: ikiwiki.out extra_clean: $(PERL) -I. $(extramodules) $(tflag) ikiwiki.in -libdir . -setup docwiki.setup -clean - rm -f *.man ikiwiki.out ikiwiki.setup plugins/*.pyc + rm -f *.man $(outprogs) ikiwiki.setup plugins/*.pyc $(MAKE) -C po clean underlay_install: @@ -115,8 +116,9 @@ extra_install: underlay_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 ikiwiki-calendar $(DESTDIR)$(PREFIX)/bin/ + for prog in $(outprogs); do \ + install $$prog $(DESTDIR)$(PREFIX)/bin/$$(shell echo $$prog | sed 's/\.out//'); \ + done $(MAKE) -C po install DESTDIR=$(DESTDIR) PREFIX=$(PREFIX) diff --git a/debian/changelog b/debian/changelog index b9a105552..57406c6d3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -19,6 +19,8 @@ ikiwiki (3.20100324) UNRELEASED; urgency=low not called by attachment plugin. * Fix incorrect influence info returned by a failing link() pagespec, that could lead to bad dependency handling in certian situations. + * Add preprocessed 'use lib' line to ikiwiki-transition and ikiwiki-calendar + if necessary for unusual install. -- Joey Hess <joeyh@debian.org> Sat, 13 Mar 2010 14:48:10 -0500 diff --git a/doc/bugs/ikiwiki-transition_does_not_set_perl_moduels_path_properly.mdwn b/doc/bugs/ikiwiki-transition_does_not_set_perl_moduels_path_properly.mdwn index 5dd4bc780..b3e87b529 100644 --- a/doc/bugs/ikiwiki-transition_does_not_set_perl_moduels_path_properly.mdwn +++ b/doc/bugs/ikiwiki-transition_does_not_set_perl_moduels_path_properly.mdwn @@ -13,3 +13,5 @@ This is not true for ikiwiki-transition: The missing line should be added. Thanks! + +[[done]] --[[Joey]] diff --git a/ikiwiki-calendar b/ikiwiki-calendar.in index a9548d6ec..9738ea5f7 100755 --- a/ikiwiki-calendar +++ b/ikiwiki-calendar.in @@ -1,6 +1,7 @@ #!/usr/bin/perl use warnings; use strict; +use lib '.'; # For use in nonstandard directory, munged by Makefile. use IkiWiki; use IkiWiki::Setup; use Getopt::Long; diff --git a/ikiwiki-transition b/ikiwiki-transition.in index 1bebb1176..e3be645cc 100755 --- a/ikiwiki-transition +++ b/ikiwiki-transition.in @@ -1,6 +1,7 @@ #!/usr/bin/perl use warnings; use strict; +use lib '.'; # For use in nonstandard directory, munged by Makefile. use IkiWiki; use HTML::Entities; diff --git a/ikiwiki.spec b/ikiwiki.spec index 2bb87724d..532a91885 100644 --- a/ikiwiki.spec +++ b/ikiwiki.spec @@ -1,5 +1,5 @@ Name: ikiwiki -Version: 3.20100312 +Version: 3.20100324 Release: 1%{?dist} Summary: A wiki compiler |