wilde: server/php Makefile,1.18.2.2,1.18.2.3

cvs at kolab.org cvs at kolab.org
Mon Nov 9 18:08:47 CET 2009


Author: wilde

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

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/php/Makefile,v
retrieving revision 1.18.2.2
retrieving revision 1.18.2.3
diff -u -d -r1.18.2.2 -r1.18.2.3
--- Makefile	9 Nov 2009 14:23:55 -0000	1.18.2.2
+++ Makefile	9 Nov 2009 17:08:44 -0000	1.18.2.3
@@ -1,25 +1,5 @@
 include ../kolab.mk
 
-ifeq "x$(KOLABPKGURI)" "x"
-	KOLABPKGURI = http://files.kolab.org/server/development-2.2/openpkg-orig-srpms/
-endif
-ifeq "x$(KOLABRPMSRC)" "x"
-	KOLABRPMSRC = $(KOLABDIR)/RPM/SRC
-endif
-ifeq "x$(KOLABRPMPKG)" "x"
-	KOLABRPMPKG = $(KOLABDIR)/RPM/PKG
-endif
-ifeq "x$(KOLABCVSDIR)" "x"
-	KOLABCVSDIR = $(CURDIR)
-endif
-ifeq "x$(RPM)" "x"
-	RPM = $(KOLABDIR)/bin/openpkg rpm
-endif
-
-ifeq "x$(PLATTAG)" "x"
-	PLATTAG = $(shell $(RPM) -q --qf="%{ARCH}-%{OS}" openpkg)-$(KOLABDIR:/%=%)
-endif
-
 PACKAGE=php
 VERSION=5.2.8
 RELEASE=20081209
@@ -31,12 +11,12 @@
 .PHONY: all
 all: $(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm
 
-$(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).$(PLATTAG).rpm $(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm $(KOLABCVSDIR)/kolab.patch $(PATCHES) Makefile
+$(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).$(PLATTAG).rpm $(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm $(CURSRCDIR)/kolab.patch $(PATCHES) Makefile
 	$(RPM) -ihv $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
 
 	cp $(PATCHES) $(KOLABRPMSRC)/$(PACKAGE)/
 
-	cd $(KOLABRPMSRC)/$(PACKAGE) && patch < $(KOLABCVSDIR)/kolab.patch && $(RPM) -ba $(PACKAGE).spec \
+	cd $(KOLABRPMSRC)/$(PACKAGE) && patch < $(CURSRCDIR)/kolab.patch && $(RPM) -ba $(PACKAGE).spec \
 	--define 'with_imap_annotate yes' --define 'with_imap_myrights yes' \
 	--define 'with_pear yes' --define 'with_spl yes' --define 'with_gettext yes' \
 	--define 'with_dom yes' --define 'with_mcrypt yes' --define 'with_iconv yes' \
@@ -45,18 +25,18 @@
 	--define 'with_openldap yes' --define 'with_mhash yes' --define 'with_zlib yes' \
 	--define 'with_bdb yes' --define 'with_xml yes' --define 'with_mm yes' \
 	--define 'with_sqlite yes' --define 'with_spl yes'
-	cp -p $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm $(KOLABCVSDIR)
+	cp -p $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm $(CURSRCDIR)
 
 $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm:
 	wget -c $(KOLABPKGURI)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
 
 .PHONY: dist
 dist: all
-	cp $(KOLABCVSDIR)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm ../stage/
+	cp $(CURSRCDIR)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm ../stage/
 
 .PHONY: clean
 clean:
-	rm -f $(KOLABCVSDIR)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm
+	rm -f $(CURSRCDIR)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm
 
 .PHONY: install
 install: $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).$(PLATTAG).rpm





More information about the commits mailing list