diff options
| author | Mark Wielaard <mwielaard@redhat.com> | 2008-08-11 12:11:26 +0200 |
|---|---|---|
| committer | Mark Wielaard <mwielaard@redhat.com> | 2008-08-11 12:11:26 +0200 |
| commit | 5b8561dccfd6d79184c044cec6bd7d01ef415acc (patch) | |
| tree | 4b2e03c1ba42cabd188fbb81f2b9d8dc33c08df6 | |
| parent | 59ec94081d98239429a440c51744cd90db1d60d7 (diff) | |
| download | systemtap-steved-5b8561dccfd6d79184c044cec6bd7d01ef415acc.tar.gz systemtap-steved-5b8561dccfd6d79184c044cec6bd7d01ef415acc.tar.xz systemtap-steved-5b8561dccfd6d79184c044cec6bd7d01ef415acc.zip | |
Use INSTALL_PROGRAM, not INSTALL_DATA for executable .stp scripts.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | Makefile.am | 5 | ||||
| -rw-r--r-- | Makefile.in | 5 |
3 files changed, 14 insertions, 2 deletions
@@ -1,3 +1,9 @@ +2008-08-11 Mark Wielaard <mwielaard@redhat.com> + + * Makefile.am (install-data-local): Use INSTALL_PROGRAM for executable + stp scripts. + * Makefile.in: Regenerated. + 2008-08-09 Frank Ch. Eigler <fche@elastic.org> * Makefile.am (example index): Only warn and instruct on index diff --git a/Makefile.am b/Makefile.am index a601b5fd..e6a5654c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -188,7 +188,10 @@ install-data-local: | while read f; do $(INSTALL_DATA) -D $$f $(DESTDIR)$(pkgdatadir)/tapset/$$f; done) (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) + | while read f; do if test -x $$f; then \ + i_cmd="$(INSTALL_PROGRAM)"; else \ + i_cmd="$(INSTALL_DATA)"; fi; \ + $$i_cmd -D $$f $(DESTDIR)$(docdir)/examples/$$f; done) TEST_COV_DIR = coverage diff --git a/Makefile.in b/Makefile.in index 1395fcab..4ed771e8 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1582,7 +1582,10 @@ install-data-local: | while read f; do $(INSTALL_DATA) -D $$f $(DESTDIR)$(pkgdatadir)/tapset/$$f; done) (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) + | while read f; do if test -x $$f; then \ + i_cmd="$(INSTALL_PROGRAM)"; else \ + i_cmd="$(INSTALL_DATA)"; fi; \ + $$i_cmd -D $$f $(DESTDIR)$(docdir)/examples/$$f; done) gcov: @-$(MAKE) clean CXXFLAGS="-g -fprofile-arcs -ftest-coverage" all check |