From: Joey Hess <joey@kodama.kitenet.net>
Date: Tue, 12 Feb 2008 22:17:49 +0000 (-0500)
Subject: * Setting NOTAINT=1 had no effect when building ikiwiki itself, fix this.
X-Git-Tag: 2.40~98
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=49adc59474027390eb53eb749a7bc95492142582;p=ikiwiki.git

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

diff --git a/Makefile.PL b/Makefile.PL
index 7608d373c..cfaa6e6cd 100755
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -23,7 +23,7 @@ PROBABLE_INST_LIB=$(shell \\
 	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
diff --git a/debian/changelog b/debian/changelog
index 2c6b03cd1..d41bf0d7e 100644
--- 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.
+  * 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
 
diff --git a/debian/rules b/debian/rules
index ef0e7f827..bf0c65a43 100755
--- 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
-	$(MAKE) NOTAINT=1
+	NOTAINT=1 $(MAKE)
 	$(MAKE) test
 	touch build-stamp