diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | Makefile.am | 9 | ||||
| -rw-r--r-- | Makefile.in | 9 |
3 files changed, 15 insertions, 10 deletions
@@ -1,5 +1,12 @@ 2008-08-08 Mark Wielaard <mwielaard@redhat.com> + * Makefile.am (EXAMPLE_BUILD_DIR): Removed. Examples indexes are + always in srcdir. + (dist-hook): Always install examples from srcdir. + * Makefile.in: Regenerated. + +2008-08-08 Mark Wielaard <mwielaard@redhat.com> + * Makefile.am (rpm): Refer to srcdir spec file so make rpm works in builddir. * Makefile.in: Regenerated. diff --git a/Makefile.am b/Makefile.am index 96ebc329..f0cf6bc7 100644 --- a/Makefile.am +++ b/Makefile.am @@ -161,14 +161,13 @@ EXTRA_DIST = auto_free.h buildrun.h elaborate.h loc2c.h session.h \ systemtap.spec EXAMPLE_SOURCE_DIR = $(srcdir)/testsuite/systemtap.examples -EXAMPLE_BUILD_DIR = $(builddir)/testsuite/systemtap.examples EXAMPLE_META_FILES = $(EXAMPLE_SOURCE_DIR)/*/*.meta EXAMPLE_INDEX_GEN = $(EXAMPLE_SOURCE_DIR)/examples-index-gen.pl -example_index: $(EXAMPLE_BUILD_DIR)/index.html +example_index: $(EXAMPLE_SOURCE_DIR)/index.html -$(EXAMPLE_BUILD_DIR)/index.html: $(EXAMPLE_META_FILES) $(EXAMPLE_INDEX_GEN) - perl $(EXAMPLE_INDEX_GEN) $(EXAMPLE_SOURCE_DIR) $(EXAMPLE_BUILD_DIR) +$(EXAMPLE_SOURCE_DIR)/index.html: $(EXAMPLE_META_FILES) $(EXAMPLE_INDEX_GEN) + perl $(EXAMPLE_INDEX_GEN) $(EXAMPLE_SOURCE_DIR) dist-hook: dist-gitversion find $(distdir) -name CVS -o -name '*~' -o -name '.#*' | xargs rm -rf @@ -185,7 +184,7 @@ install-data-local: do $(INSTALL_DATA) -D $$f $(DESTDIR)$(pkgdatadir)/runtime/uprobes/$$f; done) (cd $(srcdir)/tapset; find . \( -name '*.stp' -o -name README \) -print \ | while read f; do $(INSTALL_DATA) -D $$f $(DESTDIR)$(pkgdatadir)/tapset/$$f; done) - (cd $(builddir)/testsuite/systemtap.examples; find . -type f -print \ + (cd $(srcdir)/testsuite/systemtap.examples; find . -type f -print \ | egrep -v 'check.exp|ChangeLog|examples-index-gen.pl' \ | while read f; do $(INSTALL_DATA) -D $$f $(DESTDIR)$(docdir)/examples/$$f; done) diff --git a/Makefile.in b/Makefile.in index ee7e2758..022ac831 100644 --- a/Makefile.in +++ b/Makefile.in @@ -338,7 +338,6 @@ EXTRA_DIST = auto_free.h buildrun.h elaborate.h loc2c.h session.h \ systemtap.spec EXAMPLE_SOURCE_DIR = $(srcdir)/testsuite/systemtap.examples -EXAMPLE_BUILD_DIR = $(builddir)/testsuite/systemtap.examples EXAMPLE_META_FILES = $(EXAMPLE_SOURCE_DIR)/*/*.meta EXAMPLE_INDEX_GEN = $(EXAMPLE_SOURCE_DIR)/examples-index-gen.pl TEST_COV_DIR = coverage @@ -1559,10 +1558,10 @@ install-exec-hook: @BUILD_CRASHMOD_TRUE@ $(INSTALL) $(STAPLOG) $(DESTDIR)$(pkglibdir) @BUILD_CRASHMOD_FALSE@all-local: example_index -example_index: $(EXAMPLE_BUILD_DIR)/index.html +example_index: $(EXAMPLE_SOURCE_DIR)/index.html -$(EXAMPLE_BUILD_DIR)/index.html: $(EXAMPLE_META_FILES) $(EXAMPLE_INDEX_GEN) - perl $(EXAMPLE_INDEX_GEN) $(EXAMPLE_SOURCE_DIR) $(EXAMPLE_BUILD_DIR) +$(EXAMPLE_SOURCE_DIR)/index.html: $(EXAMPLE_META_FILES) $(EXAMPLE_INDEX_GEN) + perl $(EXAMPLE_INDEX_GEN) $(EXAMPLE_SOURCE_DIR) dist-hook: dist-gitversion find $(distdir) -name CVS -o -name '*~' -o -name '.#*' | xargs rm -rf @@ -1579,7 +1578,7 @@ install-data-local: do $(INSTALL_DATA) -D $$f $(DESTDIR)$(pkgdatadir)/runtime/uprobes/$$f; done) (cd $(srcdir)/tapset; find . \( -name '*.stp' -o -name README \) -print \ | while read f; do $(INSTALL_DATA) -D $$f $(DESTDIR)$(pkgdatadir)/tapset/$$f; done) - (cd $(builddir)/testsuite/systemtap.examples; find . -type f -print \ + (cd $(srcdir)/testsuite/systemtap.examples; find . -type f -print \ | egrep -v 'check.exp|ChangeLog|examples-index-gen.pl' \ | while read f; do $(INSTALL_DATA) -D $$f $(DESTDIR)$(docdir)/examples/$$f; done) |