[packages/spamassassin.git] / spamassassin-bug-6131.patch

#! /bin/sh /usr/share/dpatch/dpatch-run
## 05_fix_MakeMaker_use.dpach.dpatch by  <noahm@cygnus>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: No description.

@DPATCH@
diff -urNad Mail-SpamAssassin-3.2.5~/Makefile.PL Mail-SpamAssassin-3.2.5/Makefile.PL
--- Mail-SpamAssassin-3.2.5~/Makefile.PL	2008-06-10 05:21:07.000000000 -0400
+++ Mail-SpamAssassin-3.2.5/Makefile.PL	2009-10-06 17:27:33.000000000 -0400
@@ -137,9 +137,7 @@
   $mm_needs_destdir,
 );
 
-# MakeMaker prior to 6.11 doesn't support DESTDIR which is needed for
-# packaging with builddir!=destdir. See bug 2388.
-$mm_knows_destdir    = $ExtUtils::MakeMaker::Recognized_Att_Keys{DESTDIR};
+$mm_knows_destdir    = 1;
 $mm_has_good_destdir = $mm_version >= 6.11;
 # Add DESTDIR hack only if it's requested (and necessary)
 $mm_needs_destdir    = $opt{'destdir'} && !$mm_has_good_destdir;
Commit	Line	Data
4e1b5732 ER	1	#! /bin/sh /usr/share/dpatch/dpatch-run
	2	## 05_fix_MakeMaker_use.dpach.dpatch by <noahm@cygnus>
	3	##
	4	## All lines beginning with `## DP:' are a description of the patch.
	5	## DP: No description.
	6
	7	@DPATCH@
	8	diff -urNad Mail-SpamAssassin-3.2.5~/Makefile.PL Mail-SpamAssassin-3.2.5/Makefile.PL
	9	--- Mail-SpamAssassin-3.2.5~/Makefile.PL 2008-06-10 05:21:07.000000000 -0400
	10	+++ Mail-SpamAssassin-3.2.5/Makefile.PL 2009-10-06 17:27:33.000000000 -0400
	11	@@ -137,9 +137,7 @@
	12	$mm_needs_destdir,
c1fa9318	13	);
c1fa9318	14
c1fa9318 ER	15	-# MakeMaker prior to 6.11 doesn't support DESTDIR which is needed for
	16	-# packaging with builddir!=destdir. See bug 2388.
	17	-$mm_knows_destdir = $ExtUtils::MakeMaker::Recognized_Att_Keys{DESTDIR};
4e1b5732 ER	18	+$mm_knows_destdir = 1;
	19	$mm_has_good_destdir = $mm_version >= 6.11;
	20	# Add DESTDIR hack only if it's requested (and necessary)
	21	$mm_needs_destdir = $opt{'destdir'} && !$mm_has_good_destdir;