simplify sample script installation logic

3 files changed, 30 insertions, 121 deletions

diff --git a/ChangeLog b/ChangeLog
index 241409d1..8b99e4dd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-08-07  Frank Ch. Eigler  <fche@elastic.org>
+
+	* Makefile.am (all-local): Don't run indexing code, since $srcdir
+	may be read-only.
+	(install-data): Simplify sample script installation; limit sources
+	to systemtap.examples directory only.
+	* Makefile.in: Regenerated.
+
 2008-08-07  Mark Wielaard  <mwielaard@redhat.com>
 
 	* Makefile.am (all-local): Add example_index.
diff --git a/Makefile.am b/Makefile.am
index d5dde8f6..2e5d6947 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -140,12 +140,10 @@ STAPLOG=staplog.so
 $(STAPLOG): staplog.c
 	$(CC) $(staplog_CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -shared -rdynamic \
 		$(AM_LDFLAGS) $(LDFLAGS) -fPIC -o $@ $<
-all-local: $(STAPLOG) example_index
+all-local: $(STAPLOG)
 install-exec-local: $(STAPLOG)
 	$(MKDIR_P) $(DESTDIR)$(pkglibdir)
 	$(INSTALL) $(STAPLOG) $(DESTDIR)$(pkglibdir)
-else
-all-local: example_index
 endif
 
 # Get extra libs as needed
@@ -160,50 +158,8 @@ EXTRA_DIST = auto_free.h buildrun.h elaborate.h loc2c.h session.h \
 	     stap-client stap-server stap-serverd stap-find-servers stap-start-server stap-find-or-start-server stap-stop-server \
 	     systemtap.spec
 
-EXAMPLE_SOURCE_DIR = $(srcdir)/testsuite/systemtap.examples
-EXAMPLE_INSTALL_DIR = $(DESTDIR)$(datadir)/doc/systemtap/examples
-DEMO_SOURCE_DIR = $(srcdir)/testsuite/systemtap.examples/small_demos
-DEMO_INSTALL_DIR = $(DESTDIR)$(datadir)/doc/systemtap/examples/small_demos
-SAMPLE_SOURCE_DIR = $(srcdir)/testsuite/systemtap.samples
-SAMPLE_INSTALL_DIR = $(EXAMPLE_INSTALL_DIR)/samples
-
-EXAMPLE_SRC = $(EXAMPLE_SOURCE_DIR)/ChangeLog \
-	$(EXAMPLE_SOURCE_DIR)/README \
-	$(EXAMPLE_SOURCE_DIR)/*.stp \
-	$(EXAMPLE_SOURCE_DIR)/*.txt \
-	$(EXAMPLE_SOURCE_DIR)/*.meta \
-	$(EXAMPLE_SOURCE_DIR)/*.html \
-	$(EXAMPLE_SOURCE_DIR)/*.css \
-	$(EXAMPLE_SOURCE_DIR)/*.gif \
-	$(EXAMPLE_SOURCE_DIR)/*.png
-
-DEMO_SRC = \
-	$(EXAMPLE_SOURCE_DIR)/small_demos/*.stp \
-	$(EXAMPLE_SOURCE_DIR)/small_demos/*.txt \
-	$(EXAMPLE_SOURCE_DIR)/small_demos/*.wav
-
-SAMPLE_SRC = $(SAMPLE_SOURCE_DIR)/iotask.stp \
-	$(SAMPLE_SOURCE_DIR)/kmalloc-stacks.stp \
-	$(SAMPLE_SOURCE_DIR)/kmalloc-top \
-	$(SAMPLE_SOURCE_DIR)/pfaults.stp \
-	$(SAMPLE_SOURCE_DIR)/profile.stp \
-	$(SAMPLE_SOURCE_DIR)/tcp_connections.stp \
-	$(SAMPLE_SOURCE_DIR)/topsys.stp
-
-EXAMPLE_INDEXES = \
-	$(EXAMPLE_SOURCE_DIR)/index.txt \
-	$(EXAMPLE_SOURCE_DIR)/index.html \
-	$(EXAMPLE_SOURCE_DIR)/subsystem-index.txt \
-	$(EXAMPLE_SOURCE_DIR)/subsystem-index.html \
-	$(EXAMPLE_SOURCE_DIR)/keyword-index.txt \
-	$(EXAMPLE_SOURCE_DIR)/keyword-index.html
-
-example_index: $(EXAMPLE_SOURCE_DIR)/index.html
-
-$(EXAMPLE_SOURCE_DIR)/index.html: $(EXAMPLE_SOURCE_DIR)/*.meta
-	perl $(EXAMPLE_SOURCE_DIR)/examples-index-gen.pl $(EXAMPLE_SOURCE_DIR)
-
-dist-hook: dist-gitversion example_index
+
+dist-hook: dist-gitversion
 	find $(distdir) -name CVS -o -name '*~' -o -name '.#*' | xargs rm -rf
 	find $(distdir) -name '*.o' -o -name '*.ko' -o -name '*.cmd' -o -name '*.mod.c' -o -name '.??*' | xargs rm -rf
 	find $(distdir) -name 'stap' -o -name '*.log' -o -name '*.sum' -o -name 'site.exp' | xargs rm -rf
@@ -218,12 +174,9 @@ 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)
-	$(MKDIR_P) $(EXAMPLE_INSTALL_DIR)
-	$(INSTALL_DATA) $(EXAMPLE_SRC) $(EXAMPLE_INSTALL_DIR)
-	$(MKDIR_P) $(DEMO_INSTALL_DIR)
-	$(INSTALL_DATA) $(DEMO_SRC) $(DEMO_INSTALL_DIR)
-	$(MKDIR_P) $(SAMPLE_INSTALL_DIR)
-	$(INSTALL_DATA) $(SAMPLE_SRC) $(SAMPLE_INSTALL_DIR)
+	(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)
 
 TEST_COV_DIR = coverage
 
@@ -245,7 +198,6 @@ clean-local:
 	rm -rf $(TEST_COV_DIR)
 	rm -rf stap.info
 	rm -rf staplog.so
-	rm -rf $(EXAMPLE_INDEXES)
 
 uninstall-local:
 	rm -rf $(DESTDIR)$(pkgdatadir)
diff --git a/Makefile.in b/Makefile.in
index 3f978367..10dae8f1 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -337,43 +337,6 @@ EXTRA_DIST = auto_free.h buildrun.h elaborate.h loc2c.h session.h \
 	     stap-client stap-server stap-serverd stap-find-servers stap-start-server stap-find-or-start-server stap-stop-server \
 	     systemtap.spec
 
-EXAMPLE_SOURCE_DIR = $(srcdir)/testsuite/systemtap.examples
-EXAMPLE_INSTALL_DIR = $(DESTDIR)$(datadir)/doc/systemtap/examples
-DEMO_SOURCE_DIR = $(srcdir)/testsuite/systemtap.examples/small_demos
-DEMO_INSTALL_DIR = $(DESTDIR)$(datadir)/doc/systemtap/examples/small_demos
-SAMPLE_SOURCE_DIR = $(srcdir)/testsuite/systemtap.samples
-SAMPLE_INSTALL_DIR = $(EXAMPLE_INSTALL_DIR)/samples
-EXAMPLE_SRC = $(EXAMPLE_SOURCE_DIR)/ChangeLog \
-	$(EXAMPLE_SOURCE_DIR)/README \
-	$(EXAMPLE_SOURCE_DIR)/*.stp \
-	$(EXAMPLE_SOURCE_DIR)/*.txt \
-	$(EXAMPLE_SOURCE_DIR)/*.meta \
-	$(EXAMPLE_SOURCE_DIR)/*.html \
-	$(EXAMPLE_SOURCE_DIR)/*.css \
-	$(EXAMPLE_SOURCE_DIR)/*.gif \
-	$(EXAMPLE_SOURCE_DIR)/*.png
-
-DEMO_SRC = \
-	$(EXAMPLE_SOURCE_DIR)/small_demos/*.stp \
-	$(EXAMPLE_SOURCE_DIR)/small_demos/*.txt \
-	$(EXAMPLE_SOURCE_DIR)/small_demos/*.wav
-
-SAMPLE_SRC = $(SAMPLE_SOURCE_DIR)/iotask.stp \
-	$(SAMPLE_SOURCE_DIR)/kmalloc-stacks.stp \
-	$(SAMPLE_SOURCE_DIR)/kmalloc-top \
-	$(SAMPLE_SOURCE_DIR)/pfaults.stp \
-	$(SAMPLE_SOURCE_DIR)/profile.stp \
-	$(SAMPLE_SOURCE_DIR)/tcp_connections.stp \
-	$(SAMPLE_SOURCE_DIR)/topsys.stp
-
-EXAMPLE_INDEXES = \
-	$(EXAMPLE_SOURCE_DIR)/index.txt \
-	$(EXAMPLE_SOURCE_DIR)/index.html \
-	$(EXAMPLE_SOURCE_DIR)/subsystem-index.txt \
-	$(EXAMPLE_SOURCE_DIR)/subsystem-index.html \
-	$(EXAMPLE_SOURCE_DIR)/keyword-index.txt \
-	$(EXAMPLE_SOURCE_DIR)/keyword-index.html
-
 TEST_COV_DIR = coverage
 # XXX: leaves behind man pages
 SUBDIRS = testsuite doc
@@ -1199,8 +1162,8 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -1225,8 +1188,8 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) config.in $(TAGS_DEPENDENCIES) \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -1236,12 +1199,13 @@ ctags: CTAGS
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.in $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
+	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS) config.in $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique
@@ -1314,10 +1278,6 @@ dist-bzip2: distdir
 	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
 	$(am__remove_distdir)
 
-dist-lzma: distdir
-	tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
-	$(am__remove_distdir)
-
 dist-tarZ: distdir
 	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
 	$(am__remove_distdir)
@@ -1345,8 +1305,6 @@ distcheck: dist
 	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
 	*.tar.bz2*) \
 	  bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
-	*.tar.lzma*) \
-	  unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
 	*.tar.Z*) \
 	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
 	*.shar.gz*) \
@@ -1408,6 +1366,7 @@ distcleancheck: distclean
 check-am: all-am
 check: $(BUILT_SOURCES)
 	$(MAKE) $(AM_MAKEFLAGS) check-recursive
+@BUILD_CRASHMOD_FALSE@all-local:
 all-am: Makefile $(PROGRAMS) $(SCRIPTS) $(MANS) config.h all-local
 installdirs: installdirs-recursive
 installdirs-am:
@@ -1515,7 +1474,7 @@ uninstall-man: uninstall-man1 uninstall-man5 uninstall-man8
 	clean-binPROGRAMS clean-generic clean-local \
 	clean-noinstPROGRAMS clean-pkglibexecPROGRAMS ctags \
 	ctags-recursive dist dist-all dist-bzip2 dist-gzip dist-hook \
-	dist-lzma dist-shar dist-tarZ dist-zip distcheck distclean \
+	dist-shar dist-tarZ dist-zip distcheck distclean \
 	distclean-compile distclean-generic distclean-hdr \
 	distclean-tags distcleancheck distdir distuninstallcheck dvi \
 	dvi-am html html-am info info-am install install-am \
@@ -1586,18 +1545,12 @@ install-exec-hook:
 @BUILD_CRASHMOD_TRUE@$(STAPLOG): staplog.c
 @BUILD_CRASHMOD_TRUE@	$(CC) $(staplog_CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -shared -rdynamic \
 @BUILD_CRASHMOD_TRUE@		$(AM_LDFLAGS) $(LDFLAGS) -fPIC -o $@ $<
-@BUILD_CRASHMOD_TRUE@all-local: $(STAPLOG) example_index
+@BUILD_CRASHMOD_TRUE@all-local: $(STAPLOG)
 @BUILD_CRASHMOD_TRUE@install-exec-local: $(STAPLOG)
 @BUILD_CRASHMOD_TRUE@	$(MKDIR_P) $(DESTDIR)$(pkglibdir)
 @BUILD_CRASHMOD_TRUE@	$(INSTALL) $(STAPLOG) $(DESTDIR)$(pkglibdir)
-@BUILD_CRASHMOD_FALSE@all-local: example_index
-
-example_index: $(EXAMPLE_SOURCE_DIR)/index.html
-
-$(EXAMPLE_SOURCE_DIR)/index.html: $(EXAMPLE_SOURCE_DIR)/*.meta
-	perl $(EXAMPLE_SOURCE_DIR)/examples-index-gen.pl $(EXAMPLE_SOURCE_DIR)
 
-dist-hook: dist-gitversion example_index
+dist-hook: dist-gitversion
 	find $(distdir) -name CVS -o -name '*~' -o -name '.#*' | xargs rm -rf
 	find $(distdir) -name '*.o' -o -name '*.ko' -o -name '*.cmd' -o -name '*.mod.c' -o -name '.??*' | xargs rm -rf
 	find $(distdir) -name 'stap' -o -name '*.log' -o -name '*.sum' -o -name 'site.exp' | xargs rm -rf
@@ -1612,12 +1565,9 @@ 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)
-	$(MKDIR_P) $(EXAMPLE_INSTALL_DIR)
-	$(INSTALL_DATA) $(EXAMPLE_SRC) $(EXAMPLE_INSTALL_DIR)
-	$(MKDIR_P) $(DEMO_INSTALL_DIR)
-	$(INSTALL_DATA) $(DEMO_SRC) $(DEMO_INSTALL_DIR)
-	$(MKDIR_P) $(SAMPLE_INSTALL_DIR)
-	$(INSTALL_DATA) $(SAMPLE_SRC) $(SAMPLE_INSTALL_DIR)
+	(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)
 
 gcov:
 	@-$(MAKE) clean CXXFLAGS="-g -fprofile-arcs -ftest-coverage" all check
@@ -1637,7 +1587,6 @@ clean-local:
 	rm -rf $(TEST_COV_DIR)
 	rm -rf stap.info
 	rm -rf staplog.so
-	rm -rf $(EXAMPLE_INDEXES)
 
 uninstall-local:
 	rm -rf $(DESTDIR)$(pkgdatadir)