wilde: server/kolab-fbview Makefile,1.4.2.1,1.4.2.2

cvs at kolab.org cvs at kolab.org
Mon Nov 9 18:09:10 CET 2009


Author: wilde

Update of /kolabrepository/server/kolab-fbview
In directory doto:/tmp/cvs-serv27852/kolab-fbview

Modified Files:
      Tag: kolab_2_2_branch
	Makefile 
Log Message:
Some refactoring of common variables in Makefiles to the new kolab.mk.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/kolab-fbview/Makefile,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
diff -u -d -r1.4.2.1 -r1.4.2.2
--- Makefile	9 Nov 2009 14:23:50 -0000	1.4.2.1
+++ Makefile	9 Nov 2009 17:08:38 -0000	1.4.2.2
@@ -1,18 +1,5 @@
 include ../kolab.mk
 
-ifeq "x$(RPM)" "x"
-  RPM = $(KOLABDIR)/bin/openpkg rpm
-endif
-ifeq "x$(KOLABRPMSRC)" "x"
-  KOLABRPMSRC = $(KOLABDIR)/RPM/SRC
-endif
-ifeq "x$(KOLABRPMPKG)" "x"
-  KOLABRPMPKG = $(KOLABDIR)/RPM/PKG
-endif
-ifeq "x$(KOLABRPMTMP)" "x"
-  KOLABRPMTMP = $(KOLABDIR)/RPM/TMP
-endif
-
 HORDE_NAME = $(shell grep "%define[ ]*V_horde_name" *.spec | sed -e "s/.*V_horde_name \([a-z-]*\).*/\1/")
 YEAR = $(shell grep "%define[ ]*V_year" *.spec | sed -e "s/.*V_year\s*\([0-9]*\).*/\1/")
 MONTH = $(shell grep "%define[ ]*V_month" *.spec | sed -e "s/.*V_month\s*\([0-9]*\).*/\1/")





More information about the commits mailing list