[Rt-commit] rt branch, 3.8-trunk, updated. rt-3.8.8-125-g5bc33b2

[? sunnavy]

The branch, 3.8-trunk has been updated
       via  5bc33b2500797724f3391890ad2f78a098bda2de (commit)
      from  1b7781c70a5b8d9f3eecd2752cfd6baa0f62fa7d (commit)

Summary of changes:
 bin/rt.in |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

- Log -----------------------------------------------------------------
commit 5bc33b2500797724f3391890ad2f78a098bda2de
Author: sunnavy <sunnavy at bestpractical.com>
Date:   Wed Aug 4 08:10:30 2010 +0800

    add LOCAL_ETC_PATH/rt.conf search path before /etc/rt.conf, see #15372

diff --git a/bin/rt.in b/bin/rt.in
index e6ebe97..33428c3 100755
--- a/bin/rt.in
+++ b/bin/rt.in
@@ -1415,7 +1415,7 @@ sub config_from_file {
         }
 
         # Still nothing? We'll fall back to some likely defaults.
-        for ("$HOME/$rc", "/etc/rt.conf") {
+        for ("$HOME/$rc", "@LOCAL_ETC_PATH@/rt.conf", "/etc/rt.conf") {
             return parse_config_file($_) if (-r $_);
         }
     }
@@ -1826,7 +1826,8 @@ Text:
     The program looks for configuration directives in a file named .rtrc
     (or $RTCONFIG; see below) in the current directory, and then in more
     distant ancestors, until it reaches /. If no suitable configuration
-    files are found, it will also check for ~/.rtrc and /etc/rt.conf.
+    files are found, it will also check for ~/.rtrc, @LOCAL_ETC_PATH@/rt.conf
+    and /etc/rt.conf.
 
     Configuration directives:
 

-----------------------------------------------------------------------