Globally use the same (default_)user_config_dir

Also,
- Fix issues with doubled slashes in man pages (in configure.ac).
- Update some copyright years.

1 files changed, 18 insertions, 15 deletions

diff --git a/configure b/configure
index 35c1039..6f83b0a 100755
--- a/configure
+++ b/configure
@@ -593,6 +593,7 @@ default_output_program
 default_input_program
 default_fallback_editor
 default_datadir
+default_user_config_file
 sysconfdir_expanded
 bash_completion_dir
 ret_error
@@ -1734,7 +1735,7 @@ test -z "$bash_completion_dir" \
 
 
 # Use a function to allow for local variables.
-fun() {
+expand_sysconfdir() {
 	local prefix="$prefix"
 	local TARGET="$PACKAGE_NAME"
 	local next
@@ -1742,9 +1743,6 @@ fun() {
 	# If $prefix is unset by the user, set it to autoconf's default value:
 	test "$prefix" = NONE && prefix=/usr/local
 
-	# Prevent //.
-	test "$prefix" = / && prefix=''
-
 	sysconfdir_expanded="$sysconfdir"
 
 	# Expand $sysconfdir recursively (notably including $prefix):
@@ -1754,7 +1752,15 @@ fun() {
 	do
 		sysconfdir_expanded="$next"
 	done
-}; fun
+
+	# Prevent //.
+	sysconfdir_expanded="${sysconfdir_expanded//\/\//\/}"
+	test "$sysconfdir_expanded" = / && sysconfdir_expanded=''
+}; expand_sysconfdir
+
+
+default_user_config_file='$HOME/.config/ctct_config'
+
 
 
 
@@ -1764,24 +1770,19 @@ test -z "$default_datadir" && default_datadir='$HOME/.ctct'
 test -z "$default_fallback_editor" && default_fallback_editor=vi
 
 
-test -z "$default_input_program" \
-	&& default_input_program='cat'
+test -z "$default_input_program" && default_input_program='cat'
 
 
-test -z "$default_output_program" \
-	&& default_output_program='cat'
+test -z "$default_output_program" && default_output_program='cat'
 
 
-test -z "$default_visual_program" \
-	&& default_visual_program='cat'
+test -z "$default_visual_program" && default_visual_program='cat'
 
 
-test -z "$default_confirm_deletion" \
-	&& default_confirm_deletion=true
+test -z "$default_confirm_deletion" && default_confirm_deletion=true
 
 
-test -z "$default_confirm_default_yes" \
-	&& default_confirm_default_yes=false
+test -z "$default_confirm_default_yes" && default_confirm_default_yes=false
 
 
 cat >confcache <<\_ACEOF
@@ -2949,3 +2950,5 @@ if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
 $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
 fi
 
+
+# vi: ts=2 sw=2