summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Smith <dsmith@redhat.com>2008-08-26 10:40:47 -0500
committerDavid Smith <dsmith@redhat.com>2008-08-26 10:40:47 -0500
commit9b2e2b5856ee6986340f2b4cf4a43c4654b07a6a (patch)
treecd51df92b9a12d30bf2419eb94b15ffd83025fdd
parent813ed4cbfddd5ebeb034490e517595d549b837a3 (diff)
downloadsystemtap-steved-9b2e2b5856ee6986340f2b4cf4a43c4654b07a6a.tar.gz
systemtap-steved-9b2e2b5856ee6986340f2b4cf4a43c4654b07a6a.tar.xz
systemtap-steved-9b2e2b5856ee6986340f2b4cf4a43c4654b07a6a.zip
Simplified "rpm" target a bit.
2008-08-26 David Smith <dsmith@redhat.com> * Makefile.am: Simplified "rpm" target a bit. * Makefile.in: Regenerated.
-rw-r--r--ChangeLog3
-rw-r--r--Makefile.am4
-rw-r--r--Makefile.in4
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 <dsmith@redhat.com>
+ * 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`