richard: server/kolabd/kolabd ChangeLog, 1.30, 1.31 Makefile.am, 1.12, 1.13

[cvs at intevation.de]

Author: richard

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

Modified Files:
	ChangeLog Makefile.am 
Log Message:
Makefile.am: distribute only the files to be distributed
from the dist_conf directory

To give you an idea of the difference.

This is before the patch:
kolabd-2.0.99/dist_conf/CVS/
kolabd-2.0.99/dist_conf/CVS/Root
kolabd-2.0.99/dist_conf/CVS/Repository
kolabd-2.0.99/dist_conf/CVS/Entries
kolabd-2.0.99/dist_conf/suse
kolabd-2.0.99/dist_conf/Makefile
kolabd-2.0.99/dist_conf/kolab
kolabd-2.0.99/dist_conf/kolab.orig
kolabd-2.0.99/dist_conf/mandriva
kolabd-2.0.99/dist_conf/debian
kolabd-2.0.99/dist_conf/common
kolabd-2.0.99/dist_conf/gentoo
kolabd-2.0.99/dist_conf/Makefile.am
kolabd-2.0.99/dist_conf/Makefile.in
kolabd-2.0.99/dist_conf/suse.orig
kolabd-2.0.99/dist_conf/.#suse.1.5


This is after:
kolabd-2.0.99/dist_conf/suse
kolabd-2.0.99/dist_conf/kolab
kolabd-2.0.99/dist_conf/mandriva
kolabd-2.0.99/dist_conf/debian
kolabd-2.0.99/dist_conf/common
kolabd-2.0.99/dist_conf/gentoo


Just as it should, clean.





Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- ChangeLog	2 Jan 2006 19:21:03 -0000	1.30
+++ ChangeLog	3 Jan 2006 21:12:32 -0000	1.31
@@ -1,3 +1,7 @@
+2006-01-03 Richard Bos <richard at radoeka.nl>
+	* Makefile.am: distribute only the files to be distributed
+	   from the dist_conf directory
+
 2006-01-02 Marcus Hüwe <suse-tux at gmx.de>
 	Patch committed by Richard Bos
 	* Makefile.am: changed kolabrc_FILE into kolabrc_DATA to fix

Index: Makefile.am
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/Makefile.am,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- Makefile.am	2 Jan 2006 19:21:03 -0000	1.12
+++ Makefile.am	3 Jan 2006 21:12:32 -0000	1.13
@@ -6,6 +6,10 @@
 
 noinst_HEADERS = @PACKAGE at .spec
 
+# Work around to autoconf's deficiencies
+distclean-local:
+	rm -rf $(srcdir)/autom4te*.cache
+
 # is sometimes used in this file
 kolabconfdir = $(sysconfdir)/kolab
 
@@ -510,8 +514,13 @@
 CLEANFILES += rc.kolabd
 EXTRA_DIST += rc.kolabd.in
 
-
-EXTRA_DIST += dist_conf kolabd.spec.in
+EXTRA_DIST += kolabd.spec.in \
+	dist_conf/common \
+	dist_conf/debian \
+	dist_conf/gentoo \
+	dist_conf/kolab \
+	dist_conf/mandriva \
+	dist_conf/suse
 
 install-data-hook:
 	$(mkinstalldirs) -m 755 $(DESTDIR)