summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhunt <hunt>2006-04-18 18:00:13 +0000
committerhunt <hunt>2006-04-18 18:00:13 +0000
commitfdbebf4666da5d587c86dfb2305224d141a32ae4 (patch)
treeb205f08eb42fa7b6528eeae92683aa8e2f6e0d3b
parent206c02d0c60c144debb69f3f4363efb5bb7e9531 (diff)
downloadsystemtap-steved-fdbebf4666da5d587c86dfb2305224d141a32ae4.tar.gz
systemtap-steved-fdbebf4666da5d587c86dfb2305224d141a32ae4.tar.xz
systemtap-steved-fdbebf4666da5d587c86dfb2305224d141a32ae4.zip
2006-04-18 Martin Hunt <hunt@redhat.com>
* Makefile.am (install-data-local): Tweak previous fix.
-rw-r--r--ChangeLog5
-rw-r--r--Makefile.am3
-rw-r--r--Makefile.in3
3 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index bc317e86..0726efef 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,13 @@
2006-04-18 Martin Hunt <hunt@redhat.com>
+ * Makefile.am (install-data-local): Tweak previous fix.
+
+2006-04-18 Martin Hunt <hunt@redhat.com>
+
* Makefile.am (install-data-local): Rewrite. Set
ownership and permissions for all files and directories
under runtime and tapset. Restrict files to source code.
+
* Makefile.in: Rebuilt.
2006-04-18 Eugene Teo <eteo@redhat.com>
diff --git a/Makefile.am b/Makefile.am
index cbefc5d3..acd4467e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -78,7 +78,8 @@ install-data-local:
tar -cf - --mode=644 $(srcdir)/runtime/transport/*.[ch] | (cd $(DESTDIR)$(pkgdatadir) && tar xopf -)
tar -cf - --mode=644 $(srcdir)/runtime/relayfs/*.[ch] $(srcdir)/runtime/relayfs/linux/*.h \
| (cd $(DESTDIR)$(pkgdatadir) && tar xopf -)
- tar -cf - --mode=644 $(srcdir)/tapset/*.stp | (cd $(DESTDIR)$(pkgdatadir) && tar xopf -)
+ tar -cf - --mode=644 $(srcdir)/tapset/*.stp $(srcdir)/tapset/*/*.stp \
+ | (cd $(DESTDIR)$(pkgdatadir) && tar xopf -)
p=$(srcdir)/testsuite/parse
s=$(srcdir)/testsuite/sem
diff --git a/Makefile.in b/Makefile.in
index f3b5f0f8..5b7db20e 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1094,7 +1094,8 @@ install-data-local:
tar -cf - --mode=644 $(srcdir)/runtime/transport/*.[ch] | (cd $(DESTDIR)$(pkgdatadir) && tar xopf -)
tar -cf - --mode=644 $(srcdir)/runtime/relayfs/*.[ch] $(srcdir)/runtime/relayfs/linux/*.h \
| (cd $(DESTDIR)$(pkgdatadir) && tar xopf -)
- tar -cf - --mode=644 $(srcdir)/tapset/*.stp | (cd $(DESTDIR)$(pkgdatadir) && tar xopf -)
+ tar -cf - --mode=644 $(srcdir)/tapset/*.stp $(srcdir)/tapset/*/*.stp \
+ | (cd $(DESTDIR)$(pkgdatadir) && tar xopf -)
gcov:
@-$(MAKE) clean CXXFLAGS="-g -fprofile-arcs -ftest-coverage" all check