wilde: server/apache-php Makefile,1.8.2.1,1.8.2.2

cvs at kolab.org cvs at kolab.org
Mon Nov 9 15:24:22 CET 2009


Author: wilde

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

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/apache-php/Makefile,v
retrieving revision 1.8.2.1
retrieving revision 1.8.2.2
diff -u -d -r1.8.2.1 -r1.8.2.2
--- Makefile	24 Mar 2009 16:29:25 -0000	1.8.2.1
+++ Makefile	9 Nov 2009 14:23:50 -0000	1.8.2.2
@@ -1,21 +1,23 @@
+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 = $(HOME)/RPM/SRC
+	KOLABRPMSRC = $(KOLABDIR)/RPM/SRC
 endif
 ifeq "x$(KOLABRPMPKG)" "x"
-	KOLABRPMPKG = $(HOME)/RPM/PKG
+	KOLABRPMPKG = $(KOLABDIR)/RPM/PKG
 endif
 ifeq "x$(KOLABCVSDIR)" "x"
 	KOLABCVSDIR = $(CURDIR)
 endif
 ifeq "x$(RPM)" "x"
-	RPM = $(HOME)/bin/openpkg rpm
+	RPM = $(KOLABDIR)/bin/openpkg rpm
 endif
 
 ifeq "x$(PLATTAG)" "x"
-	PLATTAG = $(shell $(RPM) -q --qf="%{ARCH}-%{OS}" openpkg)-$(HOME:/%=%)
+	PLATTAG = $(shell $(RPM) -q --qf="%{ARCH}-%{OS}" openpkg)-$(KOLABDIR:/%=%)
 endif
 
 PACKAGE=apache-php





More information about the commits mailing list