wilde: server/clamav Makefile,1.7,1.7.2.1

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


Author: wilde

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

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/clamav/Makefile,v
retrieving revision 1.7
retrieving revision 1.7.2.1
diff -u -d -r1.7 -r1.7.2.1
--- Makefile	19 Jan 2009 16:23:53 -0000	1.7
+++ Makefile	9 Nov 2009 14:23:50 -0000	1.7.2.1
@@ -1,19 +1,21 @@
+include ../kolab.mk
+
 NAME = clamav
 PACKAGE = $(NAME)
 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/")
 
 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=rsync://rsync.kolab.org/kolab/server/development-2.2/externals/$(NAME)-$(VERSION).tar.gz





More information about the commits mailing list