richard: server/kolabd/kolabd ChangeLog, 1.44, 1.45 Makefile.am, 1.16, 1.17

cvs at intevation.de cvs at intevation.de
Sun Jan 15 21:32:49 CET 2006


Author: richard

Update of /kolabrepository/server/kolabd/kolabd
In directory doto:/tmp/cvs-serv5456

Modified Files:
	ChangeLog Makefile.am 
Log Message:
split the variable amavisd_confdir into amavisd_conffile and
amavisd_templatedir to give non openpkg based distro more control over
the exact amavisd_templatedir location.



Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- ChangeLog	15 Jan 2006 10:46:34 -0000	1.44
+++ ChangeLog	15 Jan 2006 20:32:47 -0000	1.45
@@ -1,4 +1,13 @@
 2006-01-15 Richard Bos <richard at radoeka.nl>
+	* Makefile.am,
+	  dist_conf/common,
+	  dist_conf/debian,
+	  dist_conf/kolab,
+	  dist_conf/suse,
+	  templates/amavisd.conf.template.in: split the variable amavisd_confdir
+	  into amavisd_conffile and amavisd_templatedir.
+
+2006-01-15 Richard Bos <richard at radoeka.nl>
 	* dist_conf/common,
 	  dist_conf/debian,
 	  dist_conf/kolab,

Index: Makefile.am
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/Makefile.am,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- Makefile.am	9 Jan 2006 22:09:08 -0000	1.16
+++ Makefile.am	15 Jan 2006 20:32:47 -0000	1.17
@@ -109,7 +109,7 @@
 	amavisd/en_US/template-virus-recipient.txt \
 	amavisd/en_US/template-virus-sender.txt
 
-amavisdusdir = $(amavisd_confdir)/templates/en_US
+amavisdusdir = $(amavisd_templatedir)/en_US
 dist_amavisdus_DATA = $(amavisdus_FILES)
 
 
@@ -121,7 +121,7 @@
 	amavisd/de/template-virus-recipient.txt \
 	amavisd/de/template-virus-sender.txt
 
-amavisddedir = $(amavisd_confdir)/templates/de
+amavisddedir = $(amavisd_templatedir)/de
 dist_amavisdde_DATA = $(amavisdde_FILES)
 
 kolabdoc_FILES = doc/README.amavisd \





More information about the commits mailing list