* Setting NOTAINT=1 had no effect when building ikiwiki itself, fix this.

diff --git a/Makefile.PL b/Makefile.PL
index 7608d373c8e6623ad2fcffc546f25fd11f491092..cfaa6e6cda31701b03fd8edb15cc48ff4e21fdad 100755 (executable)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -23,7 +23,7 @@ PROBABLE_INST_LIB=$(shell \\
        fi \\
 )
 
        fi \\
 )
 

-tflag=$(shell if [ "$$NOTAINT" != 0 ]; then printf -- "-T"; fi)
+tflag=$(shell if [ "$$NOTAINT" != 1 ]; then printf -- "-T"; fi)

 extramodules=$(shell if [ "$$PROFILE" = 1 ]; then printf -- "-MDevel::Profiler"; fi)
 
 ikiwiki.out: ikiwiki.in
 extramodules=$(shell if [ "$$PROFILE" = 1 ]; then printf -- "-MDevel::Profiler"; fi)
 
 ikiwiki.out: ikiwiki.in

diff --git a/debian/changelog b/debian/changelog
index 2c6b03cd1b60b7fc03321731fde0a7075d5243b2..d41bf0d7e40ed7800595a24dea8bbfbe0743f2b3 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,6 +20,7 @@ ikiwiki (2.40) UNRELEASED; urgency=low
     will of course be enabled by default.
   * camelcase: Convert to use new linkify and scan hooks rather than the old
     hack.
     will of course be enabled by default.
   * camelcase: Convert to use new linkify and scan hooks rather than the old
     hack.

+  * Setting NOTAINT=1 had no effect when building ikiwiki itself, fix this.

 
  -- Josh Triplett <josh@freedesktop.org>  Sun, 10 Feb 2008 13:18:58 -0800
 
 
  -- Josh Triplett <josh@freedesktop.org>  Sun, 10 Feb 2008 13:18:58 -0800
 

diff --git a/debian/rules b/debian/rules
index ef0e7f82780519992456c6b659a86a11cec73041..bf0c65a43e6a1b93de4ce764fbd021ca02593442 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -5,7 +5,7 @@ build-stamp:
        dh_testdir
        perl Makefile.PL PREFIX=/usr INSTALLDIRS=vendor
        # taint checking disabled due to perl bug #411786
        dh_testdir
        perl Makefile.PL PREFIX=/usr INSTALLDIRS=vendor
        # taint checking disabled due to perl bug #411786

-       $(MAKE) NOTAINT=1
+       NOTAINT=1 $(MAKE)

        $(MAKE) test
        touch build-stamp
 
        $(MAKE) test
        touch build-stamp