Merge branch 'master' of ssh://sources.redhat.com/git/systemtap

1 files changed, 11 insertions, 8 deletions

diff --git a/Makefile.in b/Makefile.in
index f9a43a79..07fa3fa5 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -89,9 +89,9 @@ DIST_COMMON = INSTALL NEWS README AUTHORS $(srcdir)/Makefile.in \
 	$(top_srcdir)/man/stapprobes.udp.3stap.in \
 	$(top_srcdir)/man/stapprobes.snmp.3stap.in \
 	$(top_srcdir)/initscript/systemtap.in \
-	$(top_srcdir)/initscript/stap-server.in $(srcdir)/run-stap.in \
-	$(srcdir)/run-staprun.in $(srcdir)/dtrace.in depcomp \
-	$(oldinclude_HEADERS)
+	$(top_srcdir)/initscript/stap-server.in $(srcdir)/dtrace.1.in \
+	$(srcdir)/run-stap.in $(srcdir)/run-staprun.in \
+	$(srcdir)/dtrace.in depcomp $(oldinclude_HEADERS)
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -111,7 +111,7 @@ CONFIG_CLEAN_FILES = stap.1 stapprobes.3stap stapfuncs.3stap \
 	man/stapprobes.signal.3stap man/stapprobes.socket.3stap \
 	man/stapprobes.tcp.3stap man/stapprobes.udp.3stap \
 	man/stapprobes.snmp.3stap initscript/systemtap \
-	initscript/stap-server run-stap run-staprun dtrace
+	initscript/stap-server dtrace.1 run-stap run-staprun dtrace
 CONFIG_CLEAN_VPATH_FILES =
 @BUILD_TRANSLATOR_TRUE@am__EXEEXT_1 = stap$(EXEEXT)
 am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(pkglibexecdir)" \
@@ -318,6 +318,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PIECFLAGS = @PIECFLAGS@
@@ -402,7 +403,7 @@ AM_CPPFLAGS = -DBINDIR='"$(bindir)"' -DSYSCONFDIR='"$(sysconfdir)"' -DPKGDATADIR
 AM_CFLAGS = -D_GNU_SOURCE -fexceptions -Wall -Werror -Wunused -Wformat=2 -W
 AM_CXXFLAGS = -Wall -Werror
 man_MANS = stapprobes.3stap stapfuncs.3stap stapvars.3stap \
-	stapex.3stap staprun.8 man/stapprobes.iosched.3stap \
+	stapex.3stap dtrace.1 staprun.8 man/stapprobes.iosched.3stap \
 	man/stapprobes.netdev.3stap man/stapprobes.nfs.3stap \
 	man/stapprobes.nfsd.3stap man/stapprobes.pagefault.3stap \
 	man/stapprobes.kprocess.3stap man/stapprobes.rpc.3stap \
@@ -604,6 +605,8 @@ initscript/systemtap: $(top_builddir)/config.status $(top_srcdir)/initscript/sys
 	cd $(top_builddir) && $(SHELL) ./config.status $@
 initscript/stap-server: $(top_builddir)/config.status $(top_srcdir)/initscript/stap-server.in
 	cd $(top_builddir) && $(SHELL) ./config.status $@
+dtrace.1: $(top_builddir)/config.status $(srcdir)/dtrace.1.in
+	cd $(top_builddir) && $(SHELL) ./config.status $@
 run-stap: $(top_builddir)/config.status $(srcdir)/run-stap.in
 	cd $(top_builddir) && $(SHELL) ./config.status $@
 run-staprun: $(top_builddir)/config.status $(srcdir)/run-staprun.in
@@ -1722,7 +1725,7 @@ uninstall-oldincludeHEADERS:
 #     (which will cause the Makefiles to be regenerated when you run `make');
 # (2) otherwise, pass the desired values on the `make' command line.
 $(RECURSIVE_TARGETS):
-	@failcom='exit 1'; \
+	@fail= failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
 	    *=* | --[!k]*);; \
@@ -1747,7 +1750,7 @@ $(RECURSIVE_TARGETS):
 	fi; test -z "$$fail"
 
 $(RECURSIVE_CLEAN_TARGETS):
-	@failcom='exit 1'; \
+	@fail= failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
 	    *=* | --[!k]*);; \