Rename conf file and bash completion script

Also,
- Add the new manpage to the Makefile.
- Add additional dependencies in README.
- Fix some small formatting mistakes in ctct(1).

1 files changed, 5 insertions, 6 deletions

diff --git a/ctct.in b/ctct.in
index ef7b588..a705e59 100644
--- a/ctct.in
+++ b/ctct.in
@@ -19,8 +19,7 @@
 #
 
 ## DEFAULT SETTINGS:
-system_config_dir="@default_confdir@"
-user_config_dir="@default_user_config_dir@"
+sysconfdir="@sysconfdir_expanded@"
 datadir="@default_datadir@"
 fallback_editor="@default_fallback_editor@"
 default_editor=						# none - use $EDITOR
@@ -31,10 +30,10 @@ confirm_deletion=@default_confirm_deletion@
 confirm_default_yes=@default_confirm_default_yes@
 
 ## USER SETTINGS:
-test -f "$system_config_dir/config.sh" \
-	&& source "$system_config_dir/config.sh"
-test -f "$user_config_dir/config.sh" \
-	&& source "$user_config_dir/config.sh"
+test -f "$sysconfdir/ctct_config" \
+	&& source "$sysconfdir/ctct_config"
+test -f "$user_config_file" \
+	&& source "$user_config_file"
 
 ## CONSTANTS:
 exec_name="${0##*/}"