wilde: server/kolab-webclient Makefile,1.6,1.6.2.1
cvs at kolab.org
cvs at kolab.org
Mon Nov 9 15:24:23 CET 2009
Author: wilde
Update of /kolabrepository/server/kolab-webclient
In directory doto:/tmp/cvs-serv21750/kolab-webclient
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/kolab-webclient/Makefile,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -u -d -r1.6 -r1.6.2.1
--- Makefile 5 Feb 2009 23:28:10 -0000 1.6
+++ Makefile 9 Nov 2009 14:23:51 -0000 1.6.2.1
@@ -1,18 +1,20 @@
+include ../kolab.mk
+
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
HORDE_NAME = $(shell grep "%define[ ]*V_horde_name" *.spec | sed -e "s/.*V_horde_name \([a-z-]*\).*/\1/")
More information about the commits
mailing list