richard: server/kolabd/kolabd ChangeLog, 1.13, 1.14 Makefile.am, 1.8, 1.9

cvs at intevation.de cvs at intevation.de
Sun Dec 18 09:31:56 CET 2005


Author: richard

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

Modified Files:
	ChangeLog Makefile.am 
Log Message:
* Makefile.am: removed redundant prefix dist_
  Removed commented out lines



Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- ChangeLog	17 Dec 2005 21:46:22 -0000	1.13
+++ ChangeLog	18 Dec 2005 08:31:53 -0000	1.14
@@ -1,3 +1,8 @@
+2005-12-18 Marcus Hüwe <suse-tux at gmx.de>
+	Patch committed by Richard Bos
+	* Makefile.am: removed redundant prefix dist_
+	  Removed commented out lines
+
 2005-12-17 Richard Bos <richard at radoeka.nl>
 	* dist_conf/common: added @ftpserver_pidfile@
 

Index: Makefile.am
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/Makefile.am,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- Makefile.am	17 Dec 2005 13:22:46 -0000	1.8
+++ Makefile.am	18 Dec 2005 08:31:53 -0000	1.9
@@ -15,7 +15,7 @@
   KOLAB_SCRIPTS_FILES = kolab
 endif
 
-dist_kolab_SCRIPTS = $(KOLAB_SCRIPTS_FILES) \
+kolab_SCRIPTS = $(KOLAB_SCRIPTS_FILES) \
 	kolab_sslcert.sh \
 	kolab_ca.sh \
 	kolab_bootstrap \
@@ -144,15 +144,14 @@
   KOLABBIN_FILES = namespace/kolab
 endif
 
-dist_kolabbin_DATA = kolabpasswd $(KOLABBIN_FILES)
+kolabbin_DATA = kolabpasswd $(KOLABBIN_FILES)
 
 
 if OPENPKG
   kolabrcdir = $(kolab_rcdir)
-  dist_kolabrc_DATA = rc.kolabd
+  kolabrc_DATA = rc.kolabd
 endif
 
-#srcdir = .
 
 kolab:
 	@$(mkinstalldirs) .
@@ -161,12 +160,6 @@
 CLEANFILES += kolab
 EXTRA_DIST += kolab.in
 
-#kolab2.schema:
-#	@$(mkinstalldirs) .
-#	 $(do_subst) <$(srcdir)/kolab2.schema.in >$@
-#CLEANFILES += kolab2.schema
-#EXTRA_DIST += kolab2.schema.in
-
 kolab_ca.sh:
 	@$(mkinstalldirs) .
 	 $(do_subst) <$(srcdir)/kolab_ca.sh.in >$@
@@ -221,12 +214,6 @@
 	 chmod a+x kolabquotawarn
 CLEANFILES += kolabquotawarn
 EXTRA_DIST += kolabquotawarn.in
-
-#namespace/kolab:
-#	@$(mkinstalldirs) namespace/
-#	 $(do_subst) <$(srcdir)/namespace/kolab.in >$@
-#CLEANFILES += namespace/kolab
-#EXTRA_DIST += namespace/kolab.in
 
 namespace/libexec/adduser:
 	@$(mkinstalldirs) namespace/libexec





More information about the commits mailing list