Change default installation directories:

1. afp.conf to $sysconfdir
2. UAMS to $libdir/netatalk
Fix afpd -v ouput.

diff --git a/configure.ac b/configure.ac
index f3e7b53c040291f0185220daa6bddd4039f06589..6dac0a9a2bb46a527b8b22d0d50dd8171c4a3e6d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -140,7 +140,7 @@ dnl Check for optional sysv initscript install
 AC_NETATALK_SYSV_STYLE
 
 dnl Path where UAM modules shall be installed
-AC_ARG_WITH(uams-path, [  --with-uams-path=PATH   path to UAMs [[PKGCONF/uams]]], [uams_path="$withval"], [uams_path="${PKGCONFDIR}/uams"])
+AC_ARG_WITH(uams-path, [  --with-uams-path=PATH   path to UAMs [[$libdir/netatalk/]]], [uams_path="$withval/"], [uams_path="$libdir/netatalk/"])
 
 dnl Check for libgcrypt, if found enables DHX2 UAM
 AC_NETATALK_PATH_LIBGCRYPT([1:1.2.3])

diff --git a/etc/afpd/afp_options.c b/etc/afpd/afp_options.c
index 09e04c022ae4e77f9af95faf390965bf9e982649..74275f768f281d6fe0b179da467a49bb4c546aaa 100644 (file)
--- a/etc/afpd/afp_options.c
+++ b/etc/afpd/afp_options.c
@@ -223,8 +223,8 @@ static void show_paths( void )
 {
        printf( "              afp.conf:\t%s\n", _PATH_CONFDIR "afp.conf");
        printf( "       state directory:\t%s\n", _PATH_STATEDIR);
-       printf( "    afp_signature.conf:\t%s\n", _PATH_CONFDIR "afp_signature.conf");
-       printf( "      afp_voluuid.conf:\t%s\n", _PATH_CONFDIR "afp_voluuid.conf");
+       printf( "    afp_signature.conf:\t%s\n", _PATH_STATEDIR "afp_signature.conf");
+       printf( "      afp_voluuid.conf:\t%s\n", _PATH_STATEDIR "afp_voluuid.conf");
        printf( "       UAM search path:\t%s\n", _PATH_AFPDUAMPATH );
        printf( "  Server messages path:\t%s\n", SERVERTEXT);
        printf( "              lockfile:\t%s\n", _PATH_AFPDLOCK);

diff --git a/macros/config-checks.m4 b/macros/config-checks.m4
index 1627fd1ddc8750e1b6e194f9ac17bd9d505a3d06..7582d05ee3b7b793b7ff3a4e33ce66dc6fc33264 100644 (file)
--- a/macros/config-checks.m4
+++ b/macros/config-checks.m4
@@ -1,12 +1,11 @@
-dnl $Id: config-checks.m4,v 1.6 2005-04-28 20:50:05 bfernhomberg Exp $
 dnl Autoconf macro to set the configuration directories.
 
 AC_DEFUN([AC_NETATALK_CONFIG_DIRS], [
-       PKGCONFDIR="${sysconfdir}/netatalk"
+       PKGCONFDIR="${sysconfdir}"
 
        AC_ARG_WITH(pkgconfdir,
                [  --with-pkgconfdir=DIR   package specific configuration in DIR
-                          [[SYSCONF/netatalk]]],
+                          [[$sysconfdir]]],
                        [
                        if test "x$withval" != "x"; then
                                PKGCONFDIR="$withval"