Author: dsommers Date: 2010-01-12 17:04:19 +0000 (Tue, 12 Jan 2010) New Revision: 293

Modified: trunk/Makefile Log: Reworked rpm and srpm Makefile targets - do all work inside $(cwd)/rpm/

Modified: trunk/Makefile =================================================================== --- trunk/Makefile 2010-01-12 16:50:58 UTC (rev 292) +++ trunk/Makefile 2010-01-12 17:04:19 UTC (rev 293) @@ -20,6 +20,8 @@ V7_SVN_MODULE := svn+ssh://svn.fedorahosted.org/svn/v7 V7_RHEL_VERSION := 5

+HERE=$(shell pwd) + .PHONY: clean install

SUBDIRS := test-env v7 tests docs @@ -31,7 +33,7 @@

tag: mark-version svn copy . $(V7_SVN_MODULE)/tags/`echo "v7-V$(V7_VERSION)R$(V7_RELEASE)" | sed "/./s//-/"` -m "tag version" - + mark-version: @echo " " > $(V7_VERSION_PY) @echo "# $(V7_VERSION_PY) is automatically-generated - DO NOT EDIT" >> $(V7_VERSION_PY) @@ -44,7 +46,7 @@ mkdir -p $(DESTDIR)/var/v7 mkdir -p $(DESTDIR)/var/v7/docs for i in $(SUBDIRS); do $(MAKE) -C $$i DESTDIR=$(DESTDIR) V7_VERSION=$(V7_VERSION) V7_RELEASE=$(V7_RELEASE) V7_RHEL_VERSION=$(V7_RHEL_VERSION) install; done - + clean: $(MAKE) -C tests clean $(MAKE) -C v7 clean @@ -59,8 +61,8 @@

v7-$(V7_VERSION_RELEASE).el$(V7_RHEL_VERSION).tar.bz2: /tmp/v7/exclude v7.spec tar cjS -f $@ -X /tmp/v7/exclude --exclude $@ * -

+ /tmp/v7/exclude: mkdir -p /tmp/v7 echo "CVS" > $@ @@ -74,11 +76,15 @@ v7.spec: v7.spec.in Makefile cat $< | sed -e 's/@V7_VERSION@/$(V7_VERSION)/g' -e 's/@V7_RELEASE@/$(V7_RELEASE)/g' -e 's/@V7_RHEL_VERSION@/$(V7_RHEL_VERSION)/g'> $@

+rpm-prep: v7-$(V7_VERSION_RELEASE).tar.bz2 v7.spec + rm -rf rpm + mkdir -p rpm/{BUILD,RPMS,SRPMS,SOURCES,SPECS} + cp v7-$(V7_VERSION_RELEASE).tar.bz2 rpm/SOURCES/ + cp v7.spec rpm/SPECS

-srpm: package - rpmbuild -ts v7-$(V7_VERSION_RELEASE).el$(V7_RHEL_VERSION).tar.bz2 +srpm: rpm-prep + rpmbuild --define "_topdir $(HERE)/rpm" -bs rpm/SPECS/v7.spec

-rpm: package - rpmbuild -tb v7-$(V7_VERSION_RELEASE).el$(V7_RHEL_VERSION).tar.bz2 +rpm: rpm-prep + rpmbuild --define "_topdir $(HERE)/rpm" -ba rpm/SPECS/v7.spec

-