From 206c02d0c60c144debb69f3f4363efb5bb7e9531 Mon Sep 17 00:00:00 2001
From: hunt <hunt>
Date: Tue, 18 Apr 2006 17:47:34 +0000
Subject: 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.
---
 ChangeLog   |  7 +++++++
 Makefile.am | 20 +++++---------------
 Makefile.in | 24 ++++++------------------
 3 files changed, 18 insertions(+), 33 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 86cf356c..bc317e86 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+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>
 
 	PR 1341
diff --git a/Makefile.am b/Makefile.am
index 8979fc10..cbefc5d3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -74,21 +74,11 @@ dist-hook:
 
 install-data-local:
 	mkdir -p $(DESTDIR)$(pkgdatadir)/runtime/transport
-	cp -rp $(srcdir)/runtime/*.[ch] $(srcdir)/runtime/Doxyfile \
-	       $(DESTDIR)$(pkgdatadir)/runtime
-	tar -f - -c --exclude=CVS --exclude='*~' --exclude='.#*' \
-	    -C $(srcdir)/runtime probes \
-	| (cd $(DESTDIR)$(pkgdatadir)/runtime && tar xpf -)
-	tar -f - -c --exclude=CVS --exclude='*~' --exclude='.#*' \
-	    -C $(srcdir)/runtime transport \
-	| (cd $(DESTDIR)$(pkgdatadir)/runtime && tar xpf -)
-	tar -f - -c --exclude=CVS --exclude='*~' --exclude='.#*' \
-	    -C $(srcdir)/runtime relayfs \
-	| (cd $(DESTDIR)$(pkgdatadir)/runtime && tar xpf -)
-	mkdir -p $(DESTDIR)$(pkgdatadir)/tapset \
-	$(DESTDIR)$(pkgdatadir)/tapset/i686 \
-	$(DESTDIR)$(pkgdatadir)/tapset/x86_64
-	(cd $(srcdir)/tapset ; find . -name '*.stp' | cpio -pdmv $(DESTDIR)$(pkgdatadir)/tapset)
+	tar -cf - --mode=644 $(srcdir)/runtime/*.[ch] | (cd $(DESTDIR)$(pkgdatadir) && tar xopf -)
+	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 -)
 
 p=$(srcdir)/testsuite/parse
 s=$(srcdir)/testsuite/sem
diff --git a/Makefile.in b/Makefile.in
index df9127ed..f3b5f0f8 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -17,8 +17,6 @@
 # Makefile.am --- automake input file for systemtap
 
 
-SOURCES = $(loc2c_test_SOURCES) $(stap_SOURCES) $(stpd_SOURCES)
-
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
@@ -1092,21 +1090,11 @@ dist-hook:
 
 install-data-local:
 	mkdir -p $(DESTDIR)$(pkgdatadir)/runtime/transport
-	cp -rp $(srcdir)/runtime/*.[ch] $(srcdir)/runtime/Doxyfile \
-	       $(DESTDIR)$(pkgdatadir)/runtime
-	tar -f - -c --exclude=CVS --exclude='*~' --exclude='.#*' \
-	    -C $(srcdir)/runtime probes \
-	| (cd $(DESTDIR)$(pkgdatadir)/runtime && tar xpf -)
-	tar -f - -c --exclude=CVS --exclude='*~' --exclude='.#*' \
-	    -C $(srcdir)/runtime transport \
-	| (cd $(DESTDIR)$(pkgdatadir)/runtime && tar xpf -)
-	tar -f - -c --exclude=CVS --exclude='*~' --exclude='.#*' \
-	    -C $(srcdir)/runtime relayfs \
-	| (cd $(DESTDIR)$(pkgdatadir)/runtime && tar xpf -)
-	mkdir -p $(DESTDIR)$(pkgdatadir)/tapset \
-	$(DESTDIR)$(pkgdatadir)/tapset/i686 \
-	$(DESTDIR)$(pkgdatadir)/tapset/x86_64
-	(cd $(srcdir)/tapset ; find . -name '*.stp' | cpio -pdmv $(DESTDIR)$(pkgdatadir)/tapset)
+	tar -cf - --mode=644 $(srcdir)/runtime/*.[ch] | (cd $(DESTDIR)$(pkgdatadir) && tar xopf -)
+	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 -)
 
 gcov:
 	@-$(MAKE) clean CXXFLAGS="-g -fprofile-arcs -ftest-coverage" all check
-- 
cgit