gunnar: server/kolab-webadmin Makefile,1.9,1.10

cvs at kolab.org cvs at kolab.org
Fri Jul 27 12:30:35 CEST 2007


Author: gunnar

Update of /kolabrepository/server/kolab-webadmin
In directory doto:/tmp/cvs-serv22913/kolab-webadmin

Modified Files:
	Makefile 
Log Message:
Fix the Makefiles for a possible non-standard development environment (meaning: not located in /kolab).

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/Makefile,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- Makefile	20 Dec 2005 09:18:50 -0000	1.9
+++ Makefile	27 Jul 2007 10:30:33 -0000	1.10
@@ -1,12 +1,19 @@
-RPM = /kolab/bin/openpkg rpm
 PACKAGE=kolab-webadmin
+VERSION:=`grep 'm4_define(_VERSION' $(PWD)/$(PACKAGE)/configure.ac|sed 's/m4_define(_VERSION,\(.*\))/\1/'`
+RELEASE:=`date '+%Y%m%d'`
 
+ifeq "x$(RPM)" "x"
+  RPM = $(HOME)/bin/openpkg rpm
+endif
 ifeq "x$(KOLABRPMSRC)" "x"
-  KOLABRPMSRC = /kolab/RPM/SRC
+  KOLABRPMSRC = $(HOME)/RPM/SRC
+endif
+ifeq "x$(KOLABRPMPKG)" "x"
+  KOLABRPMPKG = $(HOME)/RPM/PKG
+endif
+ifeq "x$(KOLABRPMTMP)" "x"
+  KOLABRPMTMP = $(HOME)/RPM/TMP
 endif
-
-VERSION:=`grep 'm4_define(_VERSION' $(PWD)/$(PACKAGE)/configure.ac|sed 's/m4_define(_VERSION,\(.*\))/\1/'`
-RELEASE:=`date '+%Y%m%d'`
 
 all:
 	test -d $(KOLABRPMSRC)/$(PACKAGE) || mkdir $(KOLABRPMSRC)/$(PACKAGE)





More information about the commits mailing list