diff options
| author | David Smith <dsmith@redhat.com> | 2008-08-26 09:49:58 -0500 |
|---|---|---|
| committer | David Smith <dsmith@redhat.com> | 2008-08-26 09:49:58 -0500 |
| commit | 813ed4cbfddd5ebeb034490e517595d549b837a3 (patch) | |
| tree | 703d7568d2fe80559f6c29f32be45e00d3548389 | |
| parent | 4040e9ea927a8ce508ff35096d0de74a274a2473 (diff) | |
| download | systemtap-steved-813ed4cbfddd5ebeb034490e517595d549b837a3.tar.gz systemtap-steved-813ed4cbfddd5ebeb034490e517595d549b837a3.tar.xz systemtap-steved-813ed4cbfddd5ebeb034490e517595d549b837a3.zip | |
Moved tar archive creation step from "rpm" target to "dist-gzip" target.
2008-08-26 David Smith <dsmith@redhat.com>
* Makefile.am: Moved tar archive creation step from "rpm" target
into "dist-gzip" target.
* Makefile.in: Regenerated.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | Makefile.am | 5 | ||||
| -rw-r--r-- | Makefile.in | 8 |
3 files changed, 16 insertions, 3 deletions
@@ -1,3 +1,9 @@ +2008-08-26 David Smith <dsmith@redhat.com> + + * Makefile.am: Moved tar archive creation step from "rpm" target + into "dist-gzip" target. + * Makefile.in: Regenerated. + 2008-08-25 Frank Ch. Eigler <fche@elastic.org> * Makefile.am (AUTOMAKE_OPTIONS): Add "no-dist". Remove all diff --git a/Makefile.am b/Makefile.am index eb4250b1..d0fac084 100644 --- a/Makefile.am +++ b/Makefile.am @@ -234,9 +234,12 @@ installcheck: # --define "with_bundled_elfutils 1" --define "elfutils_version 0.135" RPMBUILDFLAGS= -rpm: +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 mkdir -p `rpm --eval %_specdir` mkdir -p `rpm --eval %_srcrpmdir` mkdir -p `rpm --eval %_rpmdir` diff --git a/Makefile.in b/Makefile.in index 3d2a575a..5005acdc 100644 --- a/Makefile.in +++ b/Makefile.in @@ -317,8 +317,9 @@ TEST_COV_DIR = coverage # XXX: leaves behind man pages SUBDIRS = testsuite doc -# Any extra flags such as +# Any extra flags, such as: # --define "with_docs 0" +# --define "with_bundled_elfutils 1" --define "elfutils_version 0.135" RPMBUILDFLAGS = all: $(BUILT_SOURCES) config.h $(MAKE) $(AM_MAKEFLAGS) all-recursive @@ -1453,9 +1454,12 @@ installcheck: fi; $(MAKE) -C testsuite installcheck RUNTESTFLAGS="$(RUNTESTFLAGS)" -rpm: +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 mkdir -p `rpm --eval %_specdir` mkdir -p `rpm --eval %_srcrpmdir` mkdir -p `rpm --eval %_rpmdir` |