wilde: server/kolab-webadmin Makefile,1.17,1.17.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-webadmin
In directory doto:/tmp/cvs-serv21750/kolab-webadmin
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-webadmin/Makefile,v
retrieving revision 1.17
retrieving revision 1.17.2.1
diff -u -d -r1.17 -r1.17.2.1
--- Makefile 4 Mar 2009 11:58:35 -0000 1.17
+++ Makefile 9 Nov 2009 14:23:50 -0000 1.17.2.1
@@ -1,19 +1,21 @@
+include ../kolab.mk
+
PACKAGE=kolab-webadmin
VERSION:=`grep 'm4_define(_VERSION' $(PWD)/$(PACKAGE)/configure.ac|sed 's/m4_define(_VERSION,\(.*\))/\1/'`
RELEASE:=`date '+%Y%m%d'`
KOLAB_VERSION = $(shell { grep '^KOLAB_VERSION=".*"' ../install-kolab.sh || echo CVS; } | sed 's/.*"\(.*\)".*/\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
all:
@@ -38,7 +40,7 @@
.PHONY: clean
clean:
- rm -rf $(HOME)/RPM/TMP/$(PACKAGE)*
+ rm -rf $(KOLABDIR)/RPM/TMP/$(PACKAGE)*
find . -name "*~" | xargs rm -rf
rm -rf *.src.rpm
rm -rf *.tar.bz2
More information about the commits
mailing list