From 9b2e2b5856ee6986340f2b4cf4a43c4654b07a6a Mon Sep 17 00:00:00 2001 From: David Smith Date: Tue, 26 Aug 2008 10:40:47 -0500 Subject: Simplified "rpm" target a bit. 2008-08-26 David Smith * Makefile.am: Simplified "rpm" target a bit. * Makefile.in: Regenerated. --- ChangeLog | 3 +++ Makefile.am | 4 ++-- Makefile.in | 4 ++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 11b9346a..fec31229 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2008-08-26 David Smith + * Makefile.am: Simplified "rpm" target a bit. + * Makefile.in: Regenerated. + * Makefile.am: Moved tar archive creation step from "rpm" target into "dist-gzip" target. * Makefile.in: Regenerated. diff --git a/Makefile.am b/Makefile.am index d0fac084..867066bb 100644 --- a/Makefile.am +++ b/Makefile.am @@ -234,12 +234,12 @@ installcheck: # --define "with_bundled_elfutils 1" --define "elfutils_version 0.135" RPMBUILDFLAGS= +.PHONY: dist-gzip dist-gzip: cd $(srcdir); git status | grep working.directory.clean || (echo "You should commit your changes before 'make rpm'.") (cd $(srcdir); git archive --prefix=systemtap-$(VERSION)/ --format=tar HEAD) | gzip > systemtap-$(VERSION).tar.gz -rpm: - $(MAKE) $(AM_MAKEFLAGS) dist-gzip +rpm: dist-gzip mkdir -p `rpm --eval %_specdir` mkdir -p `rpm --eval %_srcrpmdir` mkdir -p `rpm --eval %_rpmdir` diff --git a/Makefile.in b/Makefile.in index 5005acdc..1d3225b8 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1454,12 +1454,12 @@ installcheck: fi; $(MAKE) -C testsuite installcheck RUNTESTFLAGS="$(RUNTESTFLAGS)" +.PHONY: dist-gzip dist-gzip: cd $(srcdir); git status | grep working.directory.clean || (echo "You should commit your changes before 'make rpm'.") (cd $(srcdir); git archive --prefix=systemtap-$(VERSION)/ --format=tar HEAD) | gzip > systemtap-$(VERSION).tar.gz -rpm: - $(MAKE) $(AM_MAKEFLAGS) dist-gzip +rpm: dist-gzip mkdir -p `rpm --eval %_specdir` mkdir -p `rpm --eval %_srcrpmdir` mkdir -p `rpm --eval %_rpmdir` -- cgit