steffen: server/kolab-webadmin Makefile,1.7,1.7.2.1

[cvs at intevation.de]

Author: steffen

Update of /kolabrepository/server/kolab-webadmin
In directory doto:/tmp/cvs-serv6164

Modified Files:
      Tag: kolab_2_0_branch
	Makefile 
Log Message:
Fix for issue848 (deleting users problem with distlists)

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/Makefile,v
retrieving revision 1.7
retrieving revision 1.7.2.1
diff -u -d -r1.7 -r1.7.2.1
--- Makefile	28 Apr 2005 00:16:59 -0000	1.7
+++ Makefile	11 Jan 2006 03:46:22 -0000	1.7.2.1
@@ -1,21 +1,25 @@
-RPM = /kolab/bin/openpkg rpm
-RPMNAME=kolab-webadmin
-
 ifeq "x$(KOLABRPMSRC)" "x"
   KOLABRPMSRC = /kolab/RPM/SRC
 endif
 
-VERSION:=`grep 'm4_define(_VERSION' $(PWD)/$(RPMNAME)/configure.ac|sed 's/m4_define(_VERSION,\(.*\))/\1/'`
+PACKAGE=kolab-webadmin
+VERSION:=`grep 'm4_define(_VERSION' $(PWD)/$(PACKAGE)/configure.ac|sed 's/m4_define(_VERSION,\(.*\))/\1/'`
+RELEASE:=`date '+%Y%m%d'`
+
+RPM = /kolab/bin/openpkg rpm
 
 all:
-	test -d $(KOLABRPMSRC)/$(RPMNAME) || mkdir $(KOLABRPMSRC)/$(RPMNAME)
-	cd $(RPMNAME) && ./bootstrap && ./configure --prefix=/kolab \
-	&& make dist && mv $(RPMNAME)-$(VERSION).tar.gz $(KOLABRPMSRC)/$(RPMNAME) 
-	cp $(RPMNAME)/$(RPMNAME).spec $(KOLABRPMSRC)/$(RPMNAME)/
-	cd $(KOLABRPMSRC)/$(RPMNAME) && $(RPM) -ba $(RPMNAME).spec --define 'kolab_version CVS'
+	test -d $(KOLABRPMSRC)/$(PACKAGE) || mkdir $(KOLABRPMSRC)/$(PACKAGE)
+	cd $(PACKAGE) && ./bootstrap && ./configure --prefix=/kolab \
+	&& make dist && mv $(PACKAGE)-$(VERSION).tar.gz $(KOLABRPMSRC)/$(PACKAGE) 
+	cp $(PACKAGE)/$(PACKAGE).spec $(KOLABRPMSRC)/$(PACKAGE)/
+	cd $(KOLABRPMSRC)/$(PACKAGE) && $(RPM) -ba $(PACKAGE).spec --define 'kolab_version CVS'
 binary:
-	$(RPM) -bB $(RPMNAME).spec
+	$(RPM) -bB $(PACKAGE).spec
 
 release:
-	tar cvzf $(RPMNAME)-$(VERSION).tar.gz $(RPMNAME)
-	$(RPM) -ba $(RPMNAME).spec
+	tar cvzf $(PACKAGE)-$(VERSION).tar.gz $(PACKAGE)
+	$(RPM) -ba $(PACKAGE).spec
+
+dist: all
+	cp $(KOLABRPMSRC)/../PKG/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm ../stage/