wilde: server/openldap Makefile,1.24,1.24.2.1

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


Author: wilde

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

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/openldap/Makefile,v
retrieving revision 1.24
retrieving revision 1.24.2.1
diff -u -d -r1.24 -r1.24.2.1
--- Makefile	19 Jan 2009 16:23:53 -0000	1.24
+++ Makefile	9 Nov 2009 14:23:51 -0000	1.24.2.1
@@ -1,3 +1,5 @@
+include ../kolab.mk
+
 NAME = openldap
 PACKAGE = $(NAME)
 VERSION = $(shell grep "^Version:" *.spec | sed -e "s/^Version:\s*\([0-9.]*\).*/\1/")
@@ -5,16 +7,16 @@
 KOLABRELEASE = $(RELEASE)
 
 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=ftp://ftp.openldap.org/pub/openldap/openldap-release/$(NAME)-$(VERSION).tgz





More information about the commits mailing list