From 8621a2437b443724d91ad48c844cd90fb7a94811 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Tue, 18 Aug 2009 01:06:04 +0200
Subject: [PATCH] Rename xbps.conf to xbps-src.conf, because it's only used by
 xbps-src.

--HG--
rename : etc/xbps.conf => etc/xbps-src.conf
extra : convert_revision : xtraeme%40gmail.com-20090817230604-gcvdp2q44bq2lqra
---
 bin/xbps-src/main.sh             | 6 +++---
 etc/Makefile                     | 2 +-
 etc/{xbps.conf => xbps-src.conf} | 0
 3 files changed, 4 insertions(+), 4 deletions(-)
 rename etc/{xbps.conf => xbps-src.conf} (100%)

diff --git a/bin/xbps-src/main.sh b/bin/xbps-src/main.sh
index d45420a4..156cf7b4 100755
--- a/bin/xbps-src/main.sh
+++ b/bin/xbps-src/main.sh
@@ -27,7 +27,7 @@
 #-
 trap "echo && exit 1" INT QUIT
 
-: ${XBPS_CONFIG_FILE:=@@XBPS_INSTALL_ETCDIR@@/xbps.conf}
+: ${XBPS_CONFIG_FILE:=@@XBPS_INSTALL_ETCDIR@@/xbps-src.conf}
 
 : ${progname:=$(basename $0)}
 : ${fakeroot_cmd:=fakeroot}
@@ -63,7 +63,7 @@ Targets:
 Options:
  -C     Do not remove build directory after successful installation.
  -c     Path to global configuration file:
-        if not specified @@XBPS_INSTALL_ETCDIR@@/xbps.conf is used.
+        if not specified @@XBPS_INSTALL_ETCDIR@@/xbps-src.conf is used.
  -u	Update the checksum in template file if used in 'fetch' target.
 _EOF
 	exit 1
@@ -123,7 +123,7 @@ check_config_vars()
 	local f=
 
 	if [ -z "$config_file_specified" ]; then
-		config_file_paths="$XBPS_CONFIG_FILE ./etc/xbps.conf"
+		config_file_paths="$XBPS_CONFIG_FILE ./etc/xbps-src.conf"
 		for f in $config_file_paths; do
 			[ -f $f ] && XBPS_CONFIG_FILE=$f && \
 				cffound=yes && break
diff --git a/etc/Makefile b/etc/Makefile
index c19e8fab..d1242464 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -1,6 +1,6 @@
 include ../vars.mk
 
-CONF_FILE = xbps.conf
+CONF_FILE = xbps-src.conf
 
 .PHONY: all
 all:
diff --git a/etc/xbps.conf b/etc/xbps-src.conf
similarity index 100%
rename from etc/xbps.conf
rename to etc/xbps-src.conf