wilde: server/pear/PEAR-Log Makefile,1.7,1.7.2.1
cvs at kolab.org
cvs at kolab.org
Mon Nov 9 15:24:26 CET 2009
Author: wilde
Update of /kolabrepository/server/pear/PEAR-Log
In directory doto:/tmp/cvs-serv21750/pear/PEAR-Log
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/pear/PEAR-Log/Makefile,v
retrieving revision 1.7
retrieving revision 1.7.2.1
diff -u -d -r1.7 -r1.7.2.1
--- Makefile 13 Sep 2007 13:28:13 -0000 1.7
+++ Makefile 9 Nov 2009 14:23:54 -0000 1.7.2.1
@@ -1,19 +1,21 @@
+include ../../kolab.mk
+
PEAR_NAME = $(shell grep "%define[ ]*V_pear_name" *.spec | sed -e "s/.*V_pear_name \([A-Za-z\-\_]*\).*/\1/")
PACKAGE = PEAR-$(PEAR_NAME)
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
SOURCE_0=http://pear.php.net/get/$(PEAR_NAME)-$(VERSION).tgz
More information about the commits
mailing list