summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorDave Brolley <brolley@redhat.com>2009-04-02 12:38:15 -0400
committerDave Brolley <brolley@redhat.com>2009-04-02 12:38:15 -0400
commit2f53f831393d2f0db3d54260c2a7882eff17905c (patch)
treeba140bbad1fd4acaa7c2253949a2b2ade53952a2 /doc
parent2f54c4fe5a3aa21b4d5c38edabf83f3cdad0177d (diff)
parent15a78144473940a4e7c685cc57ba09a92f2293c6 (diff)
downloadsystemtap-steved-2f53f831393d2f0db3d54260c2a7882eff17905c.tar.gz
systemtap-steved-2f53f831393d2f0db3d54260c2a7882eff17905c.tar.xz
systemtap-steved-2f53f831393d2f0db3d54260c2a7882eff17905c.zip
Merge branch 'master' of git://sources.redhat.com/git/systemtap
Conflicts: configure
Diffstat (limited to 'doc')
-rw-r--r--doc/Makefile.in1
-rw-r--r--doc/SystemTap_Tapset_Reference/Makefile.in1
2 files changed, 2 insertions, 0 deletions
diff --git a/doc/Makefile.in b/doc/Makefile.in
index eafd7ca7..beb5553e 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -101,6 +101,7 @@ PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
PIECFLAGS = @PIECFLAGS@
PIECXXFLAGS = @PIECXXFLAGS@
PIELDFLAGS = @PIELDFLAGS@
diff --git a/doc/SystemTap_Tapset_Reference/Makefile.in b/doc/SystemTap_Tapset_Reference/Makefile.in
index 30ca4b17..d4bcf8b0 100644
--- a/doc/SystemTap_Tapset_Reference/Makefile.in
+++ b/doc/SystemTap_Tapset_Reference/Makefile.in
@@ -104,6 +104,7 @@ PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
PIECFLAGS = @PIECFLAGS@
PIECXXFLAGS = @PIECXXFLAGS@
PIELDFLAGS = @PIELDFLAGS@