Index: Makefile.PL
===================================================================
RCS file: /cvsroot/spamassassin/spamassassin/Makefile.PL,v
retrieving revision 1.111
diff -u -p -r1.111 Makefile.PL
--- Makefile.PL	27 Aug 2003 23:22:06 -0000	1.111
+++ Makefile.PL	29 Aug 2003 17:56:00 -0000
@@ -6,10 +6,11 @@ require 5.005;
 # -------------           -----------------
 # PREFIX               *  /usr
 # INST_PREFIX          +  $PREFIX
-# SYSCONFDIR           *  /etc
-#                         or $(PREFIX)/etc if $(INST_PREFIX) is not "/usr"
-# INST_SYSCONFDIR      +  $SYSCONFDIR
-#                         or $(INST_PREFIX)/etc if $(INST_PREFIX) is not "/usr"
+# SYSCONFDIR           *  /etc if $(PREFIX) is "/usr" or "/usr/local"
+#                         else $(PREFIX)/etc
+# INST_SYSCONFDIR      +  $SYSCONFDIR if $(SYSCONFDIR) was set
+#                         else /etc if $(INST_PREFIX) is "/usr" or "/usr/local"
+#                         else $(INST_PREFIX)/etc
 # PKG_DEF_RULES_DIR    *  $DEF_RULES_DIR or $(PREFIX)/share/spamassassin
 # DEF_RULES_DIR        +  $(INST_PREFIX)/share/spamassassin
 # PKG_LOCAL_RULES_DIR  *  $LOCAL_RULES_DIR
@@ -267,8 +268,8 @@ sub MY::postamble {
   my $instprefix         = $self->{INST_PREFIX}
                         || $prefix;
 
-  my $is_sys_build       = ($prefix     =~ m{^(/usr/?)?$});
-  my $is_sys_inst        = ($instprefix =~ m{^(/usr/?)?$});
+  my $is_sys_build       = ($prefix     =~ m{^(/usr(/local)?/?)?$});
+  my $is_sys_inst        = ($instprefix =~ m{^(/usr(/local)?/?)?$});
 
   my $sysconfdir         = $self->{SYSCONFDIR}
                         || '';