From c1790b700ba82a4dbb5061af8e23df31930da0ed Mon Sep 17 00:00:00 2001
From: Joel Rosdahl <joel@rosdahl.net>
Date: Wed, 22 Feb 2012 21:48:03 +0100
Subject: [PATCH] Renamed CCACHE_CONFIG_PATH to CCACHE_CONFIGPATH for
 consistency

---
 MANUAL.txt | 2 +-
 ccache.c   | 2 +-
 test.sh    | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/MANUAL.txt b/MANUAL.txt
index 6717fdebc..ab39935b6 100644
--- 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 44046efc5..66d51eed0 100644
--- 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 8c0118a7c..86b402b08 100755
--- 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
 
 # ---------------------------------------
 
-- 
2.47.3