[dovecot-cvs] dovecot/src/deliver Makefile.am, 1.1.2.1, 1.1.2.2 deliver.c, 1.20.2.2, 1.20.2.3

[cras at dovecot.org]

Update of /var/lib/cvs/dovecot/src/deliver
In directory talvi:/tmp/cvs-serv245

Modified Files:
      Tag: branch_1_0
	Makefile.am deliver.c 
Log Message:
Changed hardcoded /var/run/dovecot to PKG_RUNDIR.



Index: Makefile.am
===================================================================
RCS file: /var/lib/cvs/dovecot/src/deliver/Makefile.am,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- Makefile.am	11 Jun 2006 11:10:55 -0000	1.1.2.1
+++ Makefile.am	12 Jun 2006 16:03:10 -0000	1.1.2.2
@@ -8,7 +8,8 @@
 	-I$(top_srcdir)/src/lib-mail \
 	-I$(top_srcdir)/src/lib-storage \
 	-I$(top_srcdir)/src/lib-storage/index/mbox \
-	-DSYSCONFDIR=\""$(sysconfdir)"\"
+	-DSYSCONFDIR=\""$(sysconfdir)"\" \
+	-DPKG_RUNDIR=\""$(rundir)"\"
 
 # get some functions included which only plugins use. liblib should probably
 # be a shared library so this wouldn't be needed..

Index: deliver.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/deliver/deliver.c,v
retrieving revision 1.20.2.2
retrieving revision 1.20.2.3
diff -u -d -r1.20.2.2 -r1.20.2.3
--- deliver.c	11 Jun 2006 11:37:38 -0000	1.20.2.2
+++ deliver.c	12 Jun 2006 16:03:10 -0000	1.20.2.3
@@ -28,7 +28,7 @@
 #include <syslog.h>
 
 #define DEFAULT_CONFIG_FILE SYSCONFDIR"/dovecot.conf"
-#define DEFAULT_AUTH_SOCKET_PATH "/var/run/dovecot/auth-master"
+#define DEFAULT_AUTH_SOCKET_PATH PKG_RUNDIR"/auth-master"
 #define DEFAULT_SENDMAIL_PATH "/usr/lib/sendmail"
 
 /* After buffer grows larger than this, create a temporary file to /tmp