wilde: server/php-kolab/Kolab_Freebusy Makefile,1.6.2.2,1.6.2.3

cvs at kolab.org cvs at kolab.org
Mon Nov 9 15:23:58 CET 2009


Author: wilde

Update of /kolabrepository/server/php-kolab/Kolab_Freebusy
In directory doto:/tmp/cvs-serv21750/php-kolab/Kolab_Freebusy

Modified Files:
      Tag: kolab_2_2_branch
	Makefile 
Log Message:
Replaced (ab)use of $HOME in Makefiles by new var KOLABDIR.
This is determined by asking the openpkg package for its INSTALLPREFIX.
To make this and subsequent changes easier a new source wide make includefile
kolab.mk was implemented.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Freebusy/Makefile,v
retrieving revision 1.6.2.2
retrieving revision 1.6.2.3
diff -u -d -r1.6.2.2 -r1.6.2.3
--- Makefile	6 Apr 2009 13:59:22 -0000	1.6.2.2
+++ Makefile	9 Nov 2009 14:23:56 -0000	1.6.2.3
@@ -1,22 +1,24 @@
+include ../../kolab.mk
+
 PACKAGE = $(shell grep "%define[ ]*V_package" *.spec | sed -e "s/.*V_package \([A-Za-z\-\_]*\).*/\1/")
 VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*\([0-9.]*\).*/\1/")
 RELEASE = $(shell grep "%define[ ]*V_release" *.spec | sed -e "s/.*V_release\s*\([0-9]*\).*/\1/")
 
 ifeq "x$(RPM)" "x"
-  RPM = $(HOME)/bin/openpkg rpm
+  RPM = $(KOLABDIR)/bin/openpkg rpm
 endif
 ifeq "x$(KOLABRPMSRC)" "x"
-  KOLABRPMSRC = $(HOME)/RPM/SRC
+  KOLABRPMSRC = $(KOLABDIR)/RPM/SRC
 endif
 ifeq "x$(KOLABRPMPKG)" "x"
-  KOLABRPMPKG = $(HOME)/RPM/PKG
+  KOLABRPMPKG = $(KOLABDIR)/RPM/PKG
 endif
 ifeq "x$(KOLABRPMTMP)" "x"
-  KOLABRPMTMP = $(HOME)/RPM/TMP
+  KOLABRPMTMP = $(KOLABDIR)/RPM/TMP
 endif
 
 ifeq "x$(PLATTAG)" "x"
-	PLATTAG = $(shell $(RPM) -q --qf="%{ARCH}-%{OS}" openpkg)-$(HOME:/%=%)
+	PLATTAG = $(shell $(RPM) -q --qf="%{ARCH}-%{OS}" openpkg)-$(KOLABDIR:/%=%)
 endif
 
 SOURCE_URL=http://pear.horde.org/get





More information about the commits mailing list