Merge commit 'origin/master' into pr6429-comp-unwindsyms

* commit 'origin/master':
  fix shutdown race condition for scripts that might exit during begin probes
  Fix PR 6732: Add runtime/autoconf-real-parent.c check for task_struct field.
  clarify dejagnu test case name for empty-struct changes
  add changelog entries for last two changes
  Add test suite for declaration resolution
  Fix semantic error: empty struct
  Add hack to support git 1.6 in git_version.sh
  Sync latest fix for git_version.sh from RadeonHD's tree
  Slightly cleanup code of translate.cxx
  PR2111: add general blurbage to stapprobes.5 on syscalls tapset
  Use `uname -rvm` for checking system compatibility. Generate
  Add section to stapex manual page on how installed examples are documented.
  Install examples, demos and samples.
  Install tutorial and langref manuals.

3 files changed, 47 insertions, 12 deletions

diff --git a/doc/ChangeLog b/doc/ChangeLog
index 16a3c111..600edb6d 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,9 @@
+2008-07-07  Mark Wielaard  <mwielaard@redhat.com>
+
+	* Makefile.am (install-data-hook): New, install pdf files.
+	(uninstall-local): New, uninstall them again.
+	* Makefile.in: Regenerated.
+
 2008-04-24  Will Cohen  <wcohen@redhat.com>
 
 	* Makefile.in: Regenerated.
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 25eb61d7..e4bc3800 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,11 +1,24 @@
 # Makefile.am --- automake input file for systemtap docs
 ## process this file with automake to produce Makefile.in
 
+PDF_FILES = tutorial.pdf langref.pdf
+DOC_INSTALL_DIR = $(DESTDIR)$(datadir)/doc/systemtap
+
 if BUILD_DOCS
-all-local: tutorial.pdf langref.pdf
+all-local: $(PDF_FILES)
 
 clean-local:
 	rm -f *.pdf *.out *.log *.aux *.toc *.lot *.idx *.glo
+
+install-data-hook:
+	$(MKDIR_P) $(DOC_INSTALL_DIR)
+	$(INSTALL_DATA) $(PDF_FILES) $(DOC_INSTALL_DIR)
+
+uninstall-local:
+	@list='$(PDF_FILES)'; for p in $$list; do \
+	  echo " rm -f '$(DOC_INSTALL_DIR)/$$p'"; \
+	  rm -f "$(DOC_INSTALL_DIR)/$$p"; \
+	done
 endif
 
 SUFFIXES = ps pdf dvi ps tex
diff --git a/doc/Makefile.in b/doc/Makefile.in
index a31d76f0..e01c5ebf 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
@@ -149,6 +149,8 @@ sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
+PDF_FILES = tutorial.pdf langref.pdf
+DOC_INSTALL_DIR = $(DESTDIR)$(datadir)/doc/systemtap
 SUFFIXES = ps pdf dvi ps tex
 EXTRA_DIST = tutorial.tex langref.tex tutorial nomencl.sty
 all: all-am
@@ -246,7 +248,9 @@ distclean-generic:
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
+@BUILD_DOCS_FALSE@uninstall-local:
 @BUILD_DOCS_FALSE@clean-local:
+@BUILD_DOCS_FALSE@install-data-hook:
 clean: clean-am
 
 clean-am: clean-generic clean-local mostlyclean-am
@@ -266,6 +270,8 @@ info: info-am
 info-am:
 
 install-data-am:
+	@$(NORMAL_INSTALL)
+	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
 
 install-dvi: install-dvi-am
 
@@ -299,27 +305,37 @@ ps: ps-am
 
 ps-am:
 
-uninstall-am:
+uninstall-am: uninstall-local
 
-.MAKE: install-am install-strip
+.MAKE: install-am install-data-am install-strip
 
 .PHONY: all all-am all-local check check-am clean clean-generic \
 	clean-local distclean distclean-generic distdir dvi dvi-am \
 	html html-am info info-am install install-am install-data \
-	install-data-am install-dvi install-dvi-am install-exec \
-	install-exec-am install-html install-html-am install-info \
-	install-info-am install-man install-pdf install-pdf-am \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
+	install-data-am install-data-hook install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
-	pdf-am ps ps-am uninstall uninstall-am
+	pdf-am ps ps-am uninstall uninstall-am uninstall-local
 
 
-@BUILD_DOCS_TRUE@all-local: tutorial.pdf langref.pdf
+@BUILD_DOCS_TRUE@all-local: $(PDF_FILES)
 
 @BUILD_DOCS_TRUE@clean-local:
 @BUILD_DOCS_TRUE@	rm -f *.pdf *.out *.log *.aux *.toc *.lot *.idx *.glo
 
+@BUILD_DOCS_TRUE@install-data-hook:
+@BUILD_DOCS_TRUE@	$(MKDIR_P) $(DOC_INSTALL_DIR)
+@BUILD_DOCS_TRUE@	$(INSTALL_DATA) $(PDF_FILES) $(DOC_INSTALL_DIR)
+
+@BUILD_DOCS_TRUE@uninstall-local:
+@BUILD_DOCS_TRUE@	@list='$(PDF_FILES)'; for p in $$list; do \
+@BUILD_DOCS_TRUE@	  echo " rm -f '$(DOC_INSTALL_DIR)/$$p'"; \
+@BUILD_DOCS_TRUE@	  rm -f "$(DOC_INSTALL_DIR)/$$p"; \
+@BUILD_DOCS_TRUE@	done
+
 .ps.pdf:
 	ps2pdf -r600 $<