richard: server/kolabd/kolabd/namespace kolab.in,1.2,1.3

[cvs at intevation.de]

Author: richard

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

Modified Files:
	kolab.in 
Log Message:
Change @bindir@/openpkg with @KOLABRC@ to allow other distributions to use
a replacement script for @bindir@/openpkg. 

* dist_conf/{kolab,suse}: added KOLABRC variable
* kolab_bootstrap.in: replaced @bindir@/openpkg with @KOLABRC@
* namespace/kolab.in: replaced @bindir@/openpkg with @KOLABRC@



Index: kolab.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/namespace/kolab.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- kolab.in	27 Nov 2005 23:57:02 -0000	1.2
+++ kolab.in	30 Dec 2005 10:25:21 -0000	1.3
@@ -68,7 +68,7 @@
 if [ ".${opt_prefix}" != . ]; then
     openpkg_prefix="${opt_prefix}"
 fi
-if [ -x "@bindir@/openpkg" -a -x "@libexecdir@/openpkg/rpm" ]; then
+if [ -x "@KOLABRC@" -a -x "@libexecdir@/openpkg/rpm" ]; then
     #   OpenPKG 2.0 and higher
     true
 elif [ -f "@bindir@/rpm" -a -x "@libdir@/openpkg/rpm" ]; then
@@ -184,7 +184,7 @@
     echo ""
     echo "where <command-option> and <command-argument> are <command> specific"
     echo "options and arguments. Run \"@bindir@/kolab <command> --help\""
-    echo "and \"@bindir@/openpkg man <command>\" for more details."
+    echo "and \"@KOLABRC@ man <command>\" for more details."
     echo ""
     exit 0
 fi
@@ -281,7 +281,7 @@
     echo "kolab:ERROR: No such command \"${cmd}\" found in command path" 1>&2
     echo "kolab:ERROR: (${openpkg_tools_cmdpath})." 1>&2
     echo "kolab:ERROR: Set \${OPENPKG_TOOLS_CMDPATH} appropriately." 1>&2
-    echo "kolab:ERROR: Run \"@bindir@/openpkg --help\" for list of valid commands." 1>&2
+    echo "kolab:ERROR: Run \"@KOLABRC@ --help\" for list of valid commands." 1>&2
     exit 1
 fi