gunnar: server/kolabd Makefile,1.18,1.19

cvs at kolab.org cvs at kolab.org
Wed Jul 8 12:26:22 CEST 2009


Author: gunnar

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

Modified Files:
	Makefile 
Log Message:
Use the base makefile.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/kolabd/Makefile,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- Makefile	4 Mar 2009 11:58:35 -0000	1.18
+++ Makefile	8 Jul 2009 10:26:20 -0000	1.19
@@ -1,3 +1,5 @@
+include ../Base.mk
+
 PWD := $(shell pwd)
 
 PACKAGE=kolabd
@@ -6,23 +8,6 @@
 KOLAB_VERSION = $(shell { grep '^KOLAB_VERSION=".*"' ../install-kolab.sh || echo CVS; } | sed 's/.*"\(.*\)".*/\1/')
 
 MAKETAR = dist
-
-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
-
-ifeq "x$(PLATTAG)" "x"
-	PLATTAG = $(shell $(RPM) -q --qf="%{ARCH}-%{OS}" openpkg)-$(HOME:/%=%)
-endif
 
 all: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
 





More information about the commits mailing list