Add PREFIX/bin to the hardcoded PATH within ikiwiki.

diff --git a/debian/changelog b/debian/changelog
index bcf3c9ac5a4a7b9623e2b9a6cbb150f511607113..9b308e6b69e23931c19bfbf20469684b9960e2ef 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ ikiwiki (2.45) UNRELEASED; urgency=low
   * toc: Add the table of contents at sanitize time, rather than at format
     time. This allows the toc to be displayed when previewing an edit. It also
     avoids headers in the page template from showing up in the toc.
+  * Add PREFIX/bin to the hardcoded PATH within ikiwiki.
 
  -- Joey Hess <joeyh@debian.org>  Sat, 26 Apr 2008 15:09:36 -0400
 

diff --git a/doc/bugs/__36__ENV__123__PATH__125___should_include_PREFIXbin.mdwn b/doc/bugs/__36__ENV__123__PATH__125___should_include_PREFIXbin.mdwn
index 160af9983e0dda531994af75ee7a0c23c80fe984..179c862ae3d2552c36d186d4959101247efb95e7 100644 (file)
--- a/doc/bugs/__36__ENV__123__PATH__125___should_include_PREFIXbin.mdwn
+++ b/doc/bugs/__36__ENV__123__PATH__125___should_include_PREFIXbin.mdwn
@@ -13,3 +13,5 @@ Please use full-path to installed "ikiwiki-transition" in the system() function
 Maybe pm_filter can handle this.
 
 ikiwiki installer already knows about PREFIX.
+
+[[done]]

diff --git a/pm_filter b/pm_filter
index 287adc376af82d8bc52897829ec353cd33584f82..a66cf215470f330f7bf9fb7c7b1a808472fea206 100755 (executable)
--- a/pm_filter
+++ b/pm_filter
@@ -23,3 +23,6 @@ elsif (/^use lib/) {
 elsif ($. == 1 && ($ENV{NOTAINT} || ! exists $ENV{NOTAINT}) && m{^(#!/usr/bin/perl) -T$}) {
        $_=qq{$1\n};
 }
+if (/^\$ENV{PATH}="(.*)";/) {
+       $_="\$ENV{PATH}=\"$1:$prefix/bin\";\n";
+}