summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorFrank Ch. Eigler <fche@elastic.org>2008-03-03 19:01:58 -0500
committerFrank Ch. Eigler <fche@elastic.org>2008-03-03 19:01:58 -0500
commitc108ad66d2218a1311b8891f1194d08179ae7c19 (patch)
tree66b3e148a84447d69f1340447c5edba8bf2055cd /doc
parent378f9227b04b876ff06af099715e7d60cdc49903 (diff)
parentb0be9bdb8c6972d847cad50a1e699f1fa806ad99 (diff)
downloadsystemtap-steved-c108ad66d2218a1311b8891f1194d08179ae7c19.tar.gz
systemtap-steved-c108ad66d2218a1311b8891f1194d08179ae7c19.tar.xz
systemtap-steved-c108ad66d2218a1311b8891f1194d08179ae7c19.zip
Merge branch 'master' of git://sources.redhat.com/git/systemtap
Diffstat (limited to 'doc')
-rw-r--r--doc/ChangeLog6
-rw-r--r--doc/Makefile.am2
-rw-r--r--doc/Makefile.in2
3 files changed, 8 insertions, 2 deletions
diff --git a/doc/ChangeLog b/doc/ChangeLog
index 0c7376b9..35ee8cbb 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,9 @@
+2008-03-03 Frank Ch. Eigler <fche@elastic.org>
+
+ From Masami Hiramatsu <mhiramat@redhat.com>
+ * Makefile.am (EXTRA_DIST): Add nomencl.sty.
+ * Makefile.in: Hand-regenerated.
+
2008-02-27 Frank Ch. Eigler <fche@elastic.org>
* nomencl.sty: Bundle F8 version of package, for use on older distros.
diff --git a/doc/Makefile.am b/doc/Makefile.am
index bf80fbd3..25eb61d7 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -25,4 +25,4 @@ SUFFIXES = ps pdf dvi ps tex
latex -output-directory=$$pwd $<; \
latex -output-directory=$$pwd $<
-EXTRA_DIST = tutorial.tex langref.tex tutorial
+EXTRA_DIST = tutorial.tex langref.tex tutorial nomencl.sty
diff --git a/doc/Makefile.in b/doc/Makefile.in
index 27a4ab8b..97d6f755 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -147,7 +147,7 @@ target_alias = @target_alias@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
SUFFIXES = ps pdf dvi ps tex
-EXTRA_DIST = tutorial.tex langref.tex tutorial
+EXTRA_DIST = tutorial.tex langref.tex tutorial nomencl.sty
all: all-am
.SUFFIXES: