aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joey@kodama.kitenet.net>2008-02-12 17:17:49 -0500
committerJoey Hess <joey@kodama.kitenet.net>2008-02-12 17:17:49 -0500
commit49adc59474027390eb53eb749a7bc95492142582 (patch)
tree101b98082215eb81a8b34f83e73b1c991a3114bc
parent491c62f5b0a105361fe806d898fcbb518e7fcd65 (diff)
downloadikiwiki-49adc59474027390eb53eb749a7bc95492142582.tar
ikiwiki-49adc59474027390eb53eb749a7bc95492142582.tar.gz
* Setting NOTAINT=1 had no effect when building ikiwiki itself, fix this.
-rwxr-xr-xMakefile.PL2
-rw-r--r--debian/changelog1
-rwxr-xr-xdebian/rules2
3 files changed, 3 insertions, 2 deletions
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