Renamed CCACHE_CONFIG_PATH to CCACHE_CONFIGPATH for consistency

diff --git a/MANUAL.txt b/MANUAL.txt
index 6717fdebc3704067e29a641e5e604e7fd5a2f312..ab39935b6ae69319f0ab48d2106c6186f73a9c0b 100644 (file)
--- a/MANUAL.txt
+++ b/MANUAL.txt
@@ -193,7 +193,7 @@ highest):
    */etc/ccache.conf* or */usr/local/etc/ccache.conf*).
 4. Compile-time defaults.
 
-As a special case, if the environment variable *CCACHE_CONFIG_PATH* is set,
+As a special case, if the environment variable *CCACHE_CONFIGPATH* is set,
 ccache reads configuration from the specified path instead of the default
 paths.
 

diff --git a/ccache.c b/ccache.c
index 44046efc52163d4d7fde908f06e2c34793797251..66d51eed044835f202d4b21bb2b7bb0c3a3c43ed 100644 (file)
--- a/ccache.c
+++ b/ccache.c
@@ -2013,7 +2013,7 @@ initialize(void)
        conf_free(conf);
        conf = conf_create();
 
-       p = getenv("CCACHE_CONFIG_PATH");
+       p = getenv("CCACHE_CONFIGPATH");
        if (p) {
                primary_config_path = x_strdup(p);
        } else {

diff --git a/test.sh b/test.sh
index 8c0118a7c6b45b308810e063a209b99bb1a51904..86b402b08823b345e1dc3a81f903a6e52eb915c0 100755 (executable)
--- a/test.sh
+++ b/test.sh
@@ -1856,7 +1856,7 @@ EOF
 
 upgrade_suite() {
     testname="keep maxfiles and maxsize settings"
-    rm -rf $CCACHE_DIR $CCACHE_CONFIG_PATH
+    rm -rf $CCACHE_DIR $CCACHE_CONFIGPATH
     mkdir -p $CCACHE_DIR/0
     echo "0 0 0 0 0 0 0 0 0 0 0 0 0 2000 131072" >$CCACHE_DIR/0/stats
     checkstat 'max files' 32000
@@ -1927,9 +1927,9 @@ CCACHE_DIR=`pwd`/.ccache
 export CCACHE_DIR
 CCACHE_LOGFILE=`pwd`/ccache.log
 export CCACHE_LOGFILE
-CCACHE_CONFIG_PATH=`pwd`/ccache.conf
-export CCACHE_CONFIG_PATH
-touch $CCACHE_CONFIG_PATH
+CCACHE_CONFIGPATH=`pwd`/ccache.conf
+export CCACHE_CONFIGPATH
+touch $CCACHE_CONFIGPATH
 
 # ---------------------------------------