gunnar: server/perl-ldap Makefile,1.3,1.4

cvs at kolab.org cvs at kolab.org
Thu Jul 9 17:32:36 CEST 2009


Author: gunnar

Update of /kolabrepository/server/perl-ldap
In directory doto:/tmp/cvs-serv27014

Modified Files:
	Makefile 
Log Message:
Simplify the makefile and allow direct installation of the package.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/perl-ldap/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Makefile	18 Feb 2009 17:09:37 -0000	1.3
+++ Makefile	9 Jul 2009 15:32:34 -0000	1.4
@@ -1,22 +1,11 @@
+include ../Base.mk
+
 NAME = perl-ldap
 PACKAGE = $(NAME)
 PKGVER = $(shell grep "%define[ ]*V_perl_" *.spec | sed -e "s/.*V_perl_[a-z]*\s*\([0-9.]*\).*/\1/")
 VERSION = $(shell grep "%define[ ]*V_perl " *.spec | sed -e "s/.*V_perl \s*\([0-9.]*\).*/\1/")
 RELEASE = $(shell grep "^Release:" *.spec | sed -e "s/^Release:\s*\([0-9a-z_]*\).*/\1/")
 
-ifeq "x$(RPM)" "x"
-  RPM = $(HOME)/bin/openpkg rpm
-endif
-ifeq "x$(KOLABRPMSRC)" "x"
-  KOLABRPMSRC = $(HOME)/RPM/SRC
-endif
-ifeq "x$(KOLABRPMPKG)" "x"
-  KOLABRPMPKG = $(HOME)/RPM/PKG
-endif
-ifeq "x$(KOLABRPMTMP)" "x"
-  KOLABRPMTMP = $(HOME)/RPM/TMP
-endif
-
 SOURCE_0=rsync://rsync.kolab.org/kolab/server/development-2.2/externals/$(NAME)-$(PKGVER).tar.gz
 EXTRA=cookie_parsing_error.patch sync_refresh_required.patch
 
@@ -34,7 +23,7 @@
 	rm -rf $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
 	rm -rf *~
 
-$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm: Makefile $(PACKAGE).spec $(EXTRA)
+$(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).$(PLATTAG).rpm $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm: Makefile $(PACKAGE).spec $(EXTRA)
 	test -d $(KOLABRPMSRC)/$(PACKAGE) || mkdir $(KOLABRPMSRC)/$(PACKAGE)
 	rsync -tvz "$(SOURCE_0)" $(KOLABRPMSRC)/$(PACKAGE)/
 
@@ -42,3 +31,7 @@
 	cd $(KOLABRPMSRC)/$(PACKAGE) && $(RPM) -ba $(PACKAGE).spec
 
 	cp -p $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm .
+
+.PHONY: install
+install: $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).$(PLATTAG).rpm
+	$(RPM) -Uhv --force $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).$(PLATTAG).rpm





More information about the commits mailing list