steffen: server Makefile, 1.4, 1.4.2.1 obmtool.conf, 1.174.2.30, 1.174.2.31

[cvs at intevation.de]

Author: steffen

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

Modified Files:
      Tag: kolab_2_0_branch
	Makefile obmtool.conf 
Log Message:
version + updates Makefiles to build everything from the toplevel

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/Makefile,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -d -r1.4 -r1.4.2.1
--- Makefile	6 Aug 2004 12:27:22 -0000	1.4
+++ Makefile	11 Jan 2006 04:42:40 -0000	1.4.2.1
@@ -1,48 +1,15 @@
-checkout:
-	cvs co -d imapd server/imapd
-	cvs co -d kolab server/kolab
-	cvs co -d openldap server/openldap
-	cvs co -d perl-ldap server/perl-ldap
-	cvs co -d postfix server/postfix
-	cvs co -d proftpd server/proftpd
-	cvs co -d sasl server/sasl
-	cvs co -d doc server/doc
-
 dist:
-	cd openldap && make
-	cd sasl && make
-	cd imapd && make
-	cd postfix && make
-	cd perl-ldap && make
-	cd proftpd && make
-	cd kolab && make
-
-status: 
-	cvs status imapd
-	cvs status kolab
-	cvs status openldap
-	cvs status perl-ldap
-	cvs status postfix
-	cvs status proftpd
-	cvs status sasl
-	cvs status doc
+	rm -rf stage
+	mkdir stage
+	cd imap && make dist
+	cd apache && make dist
+	cd php && make dist
+	cd openldap && make dist
+	cd imapd && make dist
+	cd postfix && make dist
+	cd perl-kolab && make -f Makefile dist
+	cd kolabd && make dist
+	cd kolab-resource-handlers && make dist
+	cd kolab-webadmin && make dist
 
-diff:
-	cvs diff imapd
-	cvs diff kolab
-	cvs diff openldap
-	cvs diff perl-ldap
-	cvs diff postfix
-	cvs diff proftpd
-	cvs diff sasl
-	cvs diff doc
 
-update:
-	cvs update imapd
-	cvs update kolab
-	cvs update openldap
-	cvs update perl-ldap
-	cvs update postfix
-	cvs update proftpd
-	cvs update sasl
-	cvs update doc

Index: obmtool.conf
===================================================================
RCS file: /kolabrepository/server/obmtool.conf,v
retrieving revision 1.174.2.30
retrieving revision 1.174.2.31
diff -u -d -r1.174.2.30 -r1.174.2.31
--- obmtool.conf	10 Jan 2006 16:30:37 -0000	1.174.2.30
+++ obmtool.conf	11 Jan 2006 04:42:40 -0000	1.174.2.31
@@ -9,21 +9,21 @@
 ##
 
 %common
-	@hasfeature TAGFMT USE DEFINE MIRROR DLTOOLS REGISTRY || exit 1
+    @hasfeature TAGFMT USE DEFINE MIRROR DLTOOLS REGISTRY || exit 1
     TMPDIR=/var/tmp                            # large tmp with 300MB space
     URL="ftp://ftp.klaralvdalens-datakonsult.se/pub/kolab/server/current/2.0" # used for non-ftp://ftp.openpkg.org/ packages
-	USERNAME=""
-	for opt in $cmdargs ; do
-        arg=`echo "${opt}" | sed -e 's;^[^=]*=*;;'`
-        opt=`echo "${opt}" | sed -e 's;=.*$;;'`
-		case $opt in
-			-u|--user) USERNAME="$arg";;
-			--url) URL="$arg";;
-        esac
-	done
+    USERNAME=""
+    for opt in $cmdargs ; do
+    	arg=`echo "${opt}" | sed -e 's;^[^=]*=*;;'`
+	opt=`echo "${opt}" | sed -e 's;=.*$;;'`
+	case $opt in
+		-u|--user) USERNAME="$arg";;
+		--url) URL="$arg";;
+    	esac
+    done
 %kolab
     echo "---- boot/build ${NODE} %${CMD} ----"
-    kolab_version="2.0.2";
+    kolab_version="2.0.3-prerelease";
     PREFIX=/${CMD};
     loc='' # '' (empty) for ftp.openpkg.org, '=' for URL, './' for CWD or absolute path
     plusloc='+'
@@ -144,8 +144,8 @@
     @install ${plusloc}dcron-2.9-2.4.0
     @install ${altloc}perl-kolab-5.8.7-2.0_20051219
     @install ${altloc}kolabd-1.9.4-20051219 --define kolab_version=$kolab_version
-    @install ${altloc}kolab-webadmin-0.4.0-20051219 --define kolab_version=$kolab_version
-    @install ${altloc}kolab-resource-handlers-0.3.9-20051222 --define kolab_version=$kolab_version
+    @install ${altloc}kolab-webadmin-0.4.0-20060111 --define kolab_version=$kolab_version
+    @install ${altloc}kolab-resource-handlers-0.3.9-20060111 --define kolab_version=$kolab_version
     @check
 
     if test ! -e "/usr/bin/kolab" ; then