gunnar: server/kolab-webadmin Makefile,1.17,1.18

cvs at kolab.org cvs at kolab.org
Tue Jan 5 00:01:21 CET 2010


Author: gunnar

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

Modified Files:
	Makefile 
Log Message:
Merge kolab.mk include directive from 2.2.3

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/Makefile,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- Makefile	4 Mar 2009 11:58:35 -0000	1.17
+++ Makefile	4 Jan 2010 23:01:19 -0000	1.18
@@ -1,21 +1,10 @@
+include ../make-helper/kolab.mk
+
 PACKAGE=kolab-webadmin
 VERSION:=`grep 'm4_define(_VERSION' $(PWD)/$(PACKAGE)/configure.ac|sed 's/m4_define(_VERSION,\(.*\))/\1/'`
 RELEASE:=`date '+%Y%m%d'`
 KOLAB_VERSION = $(shell { grep '^KOLAB_VERSION=".*"' ../install-kolab.sh || echo CVS; } | sed 's/.*"\(.*\)".*/\1/')
 
-ifeq "x$(RPM)" "x"
-  RPM = $(HOME)/bin/openpkg rpm
-endif
-ifeq "x$(KOLABRPMSRC)" "x"
-  KOLABRPMSRC = $(HOME)/RPM/SRC
-endif
-ifeq "x$(KOLABRPMPKG)" "x"
-  KOLABRPMPKG = $(HOME)/RPM/PKG
-endif
-ifeq "x$(KOLABRPMTMP)" "x"
-  KOLABRPMTMP = $(HOME)/RPM/TMP
-endif
-
 all:
 	test -d $(KOLABRPMSRC)/$(PACKAGE) || mkdir $(KOLABRPMSRC)/$(PACKAGE)
 	cd $(PACKAGE) && ./bootstrap && ./configure --prefix=/kolab \
@@ -38,7 +27,7 @@
 
 .PHONY: clean
 clean:
-	rm -rf $(HOME)/RPM/TMP/$(PACKAGE)*
+	rm -rf $(KOLABDIR)/RPM/TMP/$(PACKAGE)*
 	find . -name "*~" | xargs rm -rf
 	rm -rf *.src.rpm
 	rm -rf *.tar.bz2





More information about the commits mailing list