Rename config.vars to vars.config

This commit is contained in:
Evgeniy Khramtsov 2013-05-09 19:05:35 +10:00
parent 6e1691e2fa
commit 80ff4ad3d3
6 changed files with 7 additions and 7 deletions

View File

@ -207,7 +207,7 @@ distclean: clean clean-rel
rm -rf deps
rm -rf ebin
rm -f Makefile
rm -f config.vars
rm -f vars.config
rm -f src/ejabberd.app.src
[ ! -f ../ChangeLog ] || rm -f ../ChangeLog

4
configure vendored
View File

@ -2557,7 +2557,7 @@ esac
fi
ac_config_files="$ac_config_files Makefile config.vars src/ejabberd.app.src"
ac_config_files="$ac_config_files Makefile vars.config src/ejabberd.app.src"
ENABLEUSER=""
@ -3302,7 +3302,7 @@ for ac_config_target in $ac_config_targets
do
case $ac_config_target in
"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
"config.vars") CONFIG_FILES="$CONFIG_FILES config.vars" ;;
"vars.config") CONFIG_FILES="$CONFIG_FILES vars.config" ;;
"src/ejabberd.app.src") CONFIG_FILES="$CONFIG_FILES src/ejabberd.app.src" ;;
*) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;;

View File

@ -195,7 +195,7 @@ AC_ARG_ENABLE(all,
esac],[])
AC_CONFIG_FILES([Makefile
config.vars
vars.config
src/ejabberd.app.src])
ENABLEUSER=""

View File

@ -6,7 +6,7 @@
%%% @end
%%% Created : 1 May 2013 by Evgeniy Khramtsov <ekhramtsov@process-one.net>
%%%-------------------------------------------------------------------
Cfg = case file:consult("config.vars") of
Cfg = case file:consult("vars.config") of
{ok, Terms} ->
Terms;
_Err ->

View File

@ -6,7 +6,7 @@
%%% @end
%%% Created : 8 May 2013 by Evgeniy Khramtsov <ekhramtsov@process-one.net>
%%%-------------------------------------------------------------------
Vars = case file:consult(filename:join(["..", "config.vars"])) of
Vars = case file:consult(filename:join(["..", "vars.config"])) of
{ok, Terms} ->
Terms;
_Err ->
@ -81,7 +81,7 @@ Overlay = [
],
Config = [{sys, Sys},
{overlay_vars, "../config.vars"},
{overlay_vars, "../vars.config"},
{target_dir, "ejabberd"},
{overlay, Overlay}],