wilde: server/pear/PEAR-Horde-Channel Makefile,1.3.2.1,1.3.2.2

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


Author: wilde

Update of /kolabrepository/server/pear/PEAR-Horde-Channel
In directory doto:/tmp/cvs-serv27852/pear/PEAR-Horde-Channel

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/pear/PEAR-Horde-Channel/Makefile,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -u -d -r1.3.2.1 -r1.3.2.2
--- Makefile	9 Nov 2009 14:23:54 -0000	1.3.2.1
+++ Makefile	9 Nov 2009 17:08:43 -0000	1.3.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
-
 PACKAGE = PEAR-Horde-Channel
 VERSION = $(shell grep "^Version:" *.spec | sed -e "s/^Version:\s*\([0-9.]*\).*/\1/")
 RELEASE = $(shell grep "^Release:" *.spec | sed -e "s/^Release:\s*\([0-9]*\).*/\1/")





More information about the commits mailing list