[dovecot-cvs] dovecot/src/master Makefile.am,1.5,1.6 settings.c,1.22,1.23

[cras at procontrol.fi]

Update of /home/cvs/dovecot/src/master
In directory danu:/tmp/cvs-serv32679

Modified Files:
	Makefile.am settings.c 
Log Message:
default settings still pointed to lib dir instead of libexec dir..



Index: Makefile.am
===================================================================
RCS file: /home/cvs/dovecot/src/master/Makefile.am,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- Makefile.am	24 Nov 2002 22:08:37 -0000	1.5
+++ Makefile.am	26 Nov 2002 13:31:22 -0000	1.6
@@ -1,10 +1,12 @@
+pkglibexecdir = $(libexecdir)/dovecot
+
 sbin_PROGRAMS = imap-master
 
 INCLUDES = \
 	-I$(top_srcdir)/src/lib \
 	-DSYSCONFDIR=\""$(sysconfdir)"\" \
 	-DPKG_RUNDIR=\""$(localstatedir)/run/$(PACKAGE)"\" \
-	-DPKG_LIBDIR=\""$(pkglibdir)"\" \
+	-DPKG_LIBEXECDIR=\""$(pkglibexecdir)"\" \
 	-DSSLDIR=\""$(ssldir)\""
 
 imap_master_LDADD = \

Index: settings.c
===================================================================
RCS file: /home/cvs/dovecot/src/master/settings.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- settings.c	25 Nov 2002 10:45:40 -0000	1.22
+++ settings.c	26 Nov 2002 13:31:22 -0000	1.23
@@ -98,7 +98,7 @@
 int set_disable_plaintext_auth = FALSE;
 
 /* login */
-char *set_login_executable = PKG_LIBDIR "/imap-login";
+char *set_login_executable = PKG_LIBEXECDIR"/imap-login";
 char *set_login_user = "imapd";
 char *set_login_dir = PKG_RUNDIR"/login";
 
@@ -112,7 +112,7 @@
 gid_t set_login_gid; /* generated from set_login_user */
 
 /* imap */
-char *set_imap_executable = PKG_LIBDIR "/imap";
+char *set_imap_executable = PKG_LIBEXECDIR"/imap";
 char *set_valid_chroot_dirs = NULL;
 unsigned int set_max_imap_processes = 1024;
 int set_verbose_proctitle = FALSE;
@@ -242,7 +242,7 @@
 
 	auth = i_new(AuthConfig, 1);
 	auth->name = i_strdup(name);
-	auth->executable = i_strdup(PKG_LIBDIR "/imap-auth");
+	auth->executable = i_strdup(PKG_LIBEXECDIR"/imap-auth");
 	auth->count = 1;
 
 	auth->next = auth_processes_config;