aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Elliston <bje@gnu.org>2006-06-06 05:35:21 +0000
committerBen Elliston <bje@gnu.org>2006-06-06 05:35:21 +0000
commitb3ee71c2e357d7a0c4907aa8bb6d862d9dc0067a (patch)
tree2957ed251dc7d07ef8f56d96545c228026e48878
parent943990d8f766af6438dd57f610642e84e012217c (diff)
downloaddejagnu-b3ee71c2e357d7a0c4907aa8bb6d862d9dc0067a.zip
dejagnu-b3ee71c2e357d7a0c4907aa8bb6d862d9dc0067a.tar.gz
dejagnu-b3ee71c2e357d7a0c4907aa8bb6d862d9dc0067a.tar.bz2
* Makefile.am (CONTRIB): New.
(EXTRA_DIST): Add $(CONTRIB). (doc/dejagnu.texi): Set directory-category param to docbook2texi. * Makefile.in: Regenerate. * doc/dejagnu.texi: Likewise.
-rw-r--r--ChangeLog8
-rw-r--r--Makefile.am8
-rw-r--r--Makefile.in11
-rw-r--r--doc/dejagnu.texi1
4 files changed, 21 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index fc6434c..e0386c0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
2006-06-06 Ben Elliston <bje@gnu.org>
+ * Makefile.am (CONTRIB): New.
+ (EXTRA_DIST): Add $(CONTRIB).
+ (doc/dejagnu.texi): Set directory-category param to docbook2texi.
+ * Makefile.in: Regenerate.
+ * doc/dejagnu.texi: Likewise.
+
+2006-06-06 Ben Elliston <bje@gnu.org>
+
* runtest.exp (load_lib): Typo fix.
2006-06-06 Ben Elliston <bje@gnu.org>
diff --git a/Makefile.am b/Makefile.am
index 524ea6d..bf79264 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,7 +6,7 @@ EXTRA_DIST = ChangeLog.0 MAINTAINERS runtest site.tmpl \
$(pkgdata_DATA) $(pkgdata_SCRIPTS) \
$(config_DATA) $(config_SCRIPTS) \
$(baseboard_DATA) $(baseboard_SCRIPTS) \
- $(TESTSUITE_FILES) $(XML)
+ $(TESTSUITE_FILES) $(XML) $(CONTRIB)
bin_SCRIPTS = runtest
include_HEADERS = dejagnu.h
@@ -165,6 +165,10 @@ pkgdata_DATA = stub-loader.c testglue.c
djlibexecdir = $(pkgdatadir)/libexec
djlibexec_SCRIPTS = config.guess
+# Contributed scripts, etc.
+
+CONTRIB = contrib/compare_tests
+
# Testsuite.
TESTSUITE_FILES = \
@@ -220,7 +224,7 @@ html:
$(DOCBOOK2HTML) -o html $(srcdir)/doc/dejagnu.xml
doc/dejagnu.texi: $(XML)
- $(DOCBOOK2TEXI) --string-param directory-description="The GNU testing framework." $(srcdir)/doc/dejagnu.xml
+ $(DOCBOOK2TEXI) --string-param directory-description="The GNU testing framework." --string-param directory-category="Programming" $(srcdir)/doc/dejagnu.xml
mv dejagnu.texi $(srcdir)/doc
# Packaging.
diff --git a/Makefile.in b/Makefile.in
index 32963ce..51528b6 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -211,7 +211,7 @@ EXTRA_DIST = ChangeLog.0 MAINTAINERS runtest site.tmpl \
$(pkgdata_DATA) $(pkgdata_SCRIPTS) \
$(config_DATA) $(config_SCRIPTS) \
$(baseboard_DATA) $(baseboard_SCRIPTS) \
- $(TESTSUITE_FILES) $(XML)
+ $(TESTSUITE_FILES) $(XML) $(CONTRIB)
bin_SCRIPTS = runtest
include_HEADERS = dejagnu.h
@@ -368,6 +368,9 @@ pkgdata_DATA = stub-loader.c testglue.c
djlibexecdir = $(pkgdatadir)/libexec
djlibexec_SCRIPTS = config.guess
+# Contributed scripts, etc.
+CONTRIB = contrib/compare_tests
+
# Testsuite.
TESTSUITE_FILES = \
testsuite/runtest.all/topdir/subdir1/subsubdir1/subsubfile1 \
@@ -873,7 +876,7 @@ distclean-DEJAGNU:
distdir: $(DISTFILES)
$(am__remove_distdir)
mkdir $(distdir)
- $(mkdir_p) $(distdir)/baseboards $(distdir)/config $(distdir)/doc $(distdir)/lib $(distdir)/testsuite/config $(distdir)/testsuite/lib $(distdir)/testsuite/libdejagnu $(distdir)/testsuite/runtest.all $(distdir)/testsuite/runtest.all/topdir/subdir1 $(distdir)/testsuite/runtest.all/topdir/subdir1/subsubdir1 $(distdir)/testsuite/runtest.all/topdir/subdir2
+ $(mkdir_p) $(distdir)/baseboards $(distdir)/config $(distdir)/contrib $(distdir)/doc $(distdir)/lib $(distdir)/testsuite/config $(distdir)/testsuite/lib $(distdir)/testsuite/libdejagnu $(distdir)/testsuite/runtest.all $(distdir)/testsuite/runtest.all/topdir/subdir1 $(distdir)/testsuite/runtest.all/topdir/subdir1/subsubdir1 $(distdir)/testsuite/runtest.all/topdir/subdir2
@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
list='$(DISTFILES)'; for file in $$list; do \
@@ -1164,11 +1167,9 @@ html:
$(DOCBOOK2HTML) -o html $(srcdir)/doc/dejagnu.xml
doc/dejagnu.texi: $(XML)
- $(DOCBOOK2TEXI) --string-param directory-description="The GNU testing framework." $(srcdir)/doc/dejagnu.xml
+ $(DOCBOOK2TEXI) --string-param directory-description="The GNU testing framework." --string-param directory-category="Programming" $(srcdir)/doc/dejagnu.xml
mv dejagnu.texi $(srcdir)/doc
-# -g output-file="$(srcdir)/doc/dejagnu.texi"
-
# Packaging.
# RPM
diff --git a/doc/dejagnu.texi b/doc/dejagnu.texi
index 8ac307a..fb3cab3 100644
--- a/doc/dejagnu.texi
+++ b/doc/dejagnu.texi
@@ -2,6 +2,7 @@
@setfilename dejagnu.info
@documentencoding us-ascii
@settitle DejaGnu
+@dircategory Programming
@direntry
* DejaGnu: (dejagnu). The GNU testing framework.
@end direntry