diff options
| author | Mark Wielaard <mwielaard@redhat.com> | 2008-05-29 14:17:39 +0200 |
|---|---|---|
| committer | Mark Wielaard <mwielaard@redhat.com> | 2008-06-11 18:22:27 +0200 |
| commit | 20fb5020388d8ef57777f5e75a2430f2ee15cac3 (patch) | |
| tree | 21cfbf3b070a2887fd9bf265df8dcdfdb2bd101f | |
| parent | 0562c0e77429fd6798f8a1d46ef597527e7a392f (diff) | |
| download | systemtap-steved-20fb5020388d8ef57777f5e75a2430f2ee15cac3.tar.gz systemtap-steved-20fb5020388d8ef57777f5e75a2430f2ee15cac3.tar.xz systemtap-steved-20fb5020388d8ef57777f5e75a2430f2ee15cac3.zip | |
Check that make install was run before doing make installcheck.
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | Makefile.am | 8 | ||||
| -rw-r--r-- | Makefile.in | 8 |
3 files changed, 20 insertions, 0 deletions
@@ -147,6 +147,10 @@ PR 6429. * Makefile.am: Don't link stapio with -ldw. + +2008-05-29 Mark Wielaard <mwielaard@redhat.com> + + * Makefile.am (installcheck): Check that make install was run. * Makefile.in: Regenerated. 2008-06-02 Frank Ch. Eigler <fche@elastic.org> diff --git a/Makefile.am b/Makefile.am index 82d056c7..7024a505 100644 --- a/Makefile.am +++ b/Makefile.am @@ -230,6 +230,14 @@ check: $(MAKE) -C testsuite check SYSTEMTAP_RUNTIME=$$SRCDIR/runtime SYSTEMTAP_TAPSET=$$SRCDIR/tapset LD_LIBRARY_PATH=$(PWD)/lib-elfutils:$(PWD)/lib-elfutils/systemtap SYSTEMTAP_PATH=$(PWD) RUNTESTFLAGS="$(RUNTESTFLAGS)" installcheck: + if test \! -e $(DESTDIR)$(bindir)/stap; then \ + echo $(DESTDIR)$(bindir)/stap doesn\'t exist, run make install; \ + exit -1; \ + fi + if test $(builddir)/stap -nt $(DESTDIR)$(bindir)/stap; then \ + echo "$(DESTDIR)$(bindir)/stap is not recent, run make install"; \ + exit -1; \ + fi $(MAKE) -C testsuite installcheck RUNTESTFLAGS="$(RUNTESTFLAGS)" rpm: systemtap.spec dist diff --git a/Makefile.in b/Makefile.in index fa14e05b..d0ed3dce 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1594,6 +1594,14 @@ check: $(MAKE) -C testsuite check SYSTEMTAP_RUNTIME=$$SRCDIR/runtime SYSTEMTAP_TAPSET=$$SRCDIR/tapset LD_LIBRARY_PATH=$(PWD)/lib-elfutils:$(PWD)/lib-elfutils/systemtap SYSTEMTAP_PATH=$(PWD) RUNTESTFLAGS="$(RUNTESTFLAGS)" installcheck: + if test \! -e $(DESTDIR)$(bindir)/stap; then \ + echo $(DESTDIR)$(bindir)/stap doesn\'t exist, run make install; \ + exit -1; \ + fi + if test $(builddir)/stap -nt $(DESTDIR)$(bindir)/stap; then \ + echo "$(DESTDIR)$(bindir)/stap is not recent, run make install"; \ + exit -1; \ + fi $(MAKE) -C testsuite installcheck RUNTESTFLAGS="$(RUNTESTFLAGS)" rpm: systemtap.spec dist |