richard: server/kolabd/kolabd/dist_conf kolab,1.5,1.6

cvs at intevation.de cvs at intevation.de
Sat Dec 10 22:57:13 CET 2005


Author: richard

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

Modified Files:
	kolab 
Log Message:
https://intevation.de/roundup/kolab/issue1021

* Makefile.am: fixed a typo: templtes should be templates
  - kolabdocdir was not using the dist_conf file.  It is now, and the
    documentation directory can be defined with: pkgdocdir
  - kolabrcdir was not using the dist_conf file.  It is now, and the
    rc directory can be defined with: kolab_rcdir
  - Added ChangeLog, NEWS, COPYING and AUTHORS to the document files
    to be distributed.
  - INSTALL will be included in the tarbal
  - Changed the document path to $(pkgdocdir)/kolabd (that is
    ../share/kolab/doc, to .../share/doc/kolabd.  To prevent classes
    with files named the same (e.g. ChangeLog) from other modules.
* dist-conf/kolab: added pkgdocdir to reflect the change in Makefile.am
  - Added perllib
* kolab_bootstrap.in: use the '[x]' trick to prevent grep to show
  in the process list...
* kolabquotawarn.in: removed unnecessary prefix assignment
* doc/README.amavisd.in: replace @l_prefix@/var by the autotools prefix
  variable @localstatedir@
* doc/README.webgui.in: replace @l_prefix@/etc by the autotools prefix
  variable @sysconfdir@
* namespace/libexec/showlog.in: removed commented out prefix
  assignment.  It is really not needed anymore
* kolab_bootstrap.in: removed redundant kolab_prefix assigment
  replaced $kolab_prefix/bin by @bindir@
* rc.kolabd.in: @prefix@/lib/openpkg/bash replaced by @BASH@
* NEWS: added
* AUTHORS: added
* bootstrap: removed touching of the files: NEWS, ChangeLog and
  AUTHORS, as they are now in CVS



Index: kolab
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/kolab,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- kolab	5 Dec 2005 16:21:34 -0000	1.5
+++ kolab	10 Dec 2005 21:57:11 -0000	1.6
@@ -19,11 +19,15 @@
 # @l_susr@
 kolab_susr=root
 
-kolab_rcdir=${sysconfdir}/rc.d
-
 BASH=${libdir}/openpkg/bash
 PERL=${bindir}/perl
 PHP=${bindir}/php
+
+kolab_rcdir=${sysconfdir}/rc.d
+pkgdocdir=${datadir}/doc
+
+# /kolab/bin/perl -V:vendorlib | sed "s/.*'\(.*\)'\;/\1/"
+perllib=${libdir}/perl/vendor_perl/5.8.5
 
 amavisd_confdir=${sysconfdir}/amavisd
 amavisd_logfile=${localstatedir}/amavisd/amavis.log





More information about the commits mailing list