svn commit: r154089 - spamassassin/trunk/Makefile.PL

[ms...@apache.org]

Author: mss
Date: Wed Feb 16 14:06:17 2005
New Revision: 154089

URL: http://svn.apache.org/viewcvs?view=rev&rev=154089
Log:
Axed some old code which was supposed to be removed for the 3.0 release.

Modified:
    spamassassin/trunk/Makefile.PL

Modified: spamassassin/trunk/Makefile.PL
URL: http://svn.apache.org/viewcvs/spamassassin/trunk/Makefile.PL?view=diff&r1=154088&r2=154089
==============================================================================
--- spamassassin/trunk/Makefile.PL (original)
+++ spamassassin/trunk/Makefile.PL Wed Feb 16 14:06:17 2005
@@ -101,8 +101,6 @@
   'contact_address' => undef,
   'run_net_tests'   => undef,
   'destdir'         => undef,
-  '__cruft'         => undef,
-  'ignore_cruft'    => undef,
 );
 ARGV: foreach (@ARGV) {
   foreach my $key (keys %opt) {
@@ -113,10 +111,6 @@
       $opt{$key} = $val;
       next ARGV;
     }
-
-    if (defined parse_arg($_, qr/INST_(?:PREFIX|SITELIB|SYSCONFDIR)|[A-Z_]+_RULES_DIR/)) {
-      $opt{'__cruft'} = 1;
-    }
   }
 }
 
@@ -257,26 +251,6 @@
     'Net::DNS' => (RUNNING_ON_WINDOWS ? 0.46 : 0.34),
     'Razor2::Client::Agent' => 2.40,
 );
-
-if (bool($opt{'__cruft'}, 0) and not bool($opt{'ignore_cruft'}, 0)) {
-  my $error = <<OLD_CRUFT;
-
-    ***********************************************************************
-    You attempted to use one of the following unsupported variables:
-      INST_PREFIX
-      INST_SITELIB
-      INST_SYSCONFDIR
-      DEF_RULES_DIR
-      LOCAL_RULES_DIR
-    Please read INSTALL and PACKAGING for new usage instructions.
-
-    Thanks and sorry for any inconvenience.
-    ***********************************************************************
-
-OLD_CRUFT
-  $error =~ s/^ {4}//gm;
-  die $error;
-}
 
 if ($mm_needs_destdir) {
   my $error = <<DESTDIR_HACK;