diff options
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/Makefile.in | 17 | ||||
| -rw-r--r-- | doc/user.sgml | 6 |
2 files changed, 15 insertions, 8 deletions
diff --git a/doc/Makefile.in b/doc/Makefile.in index 21ed404..853c833 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.6 from Makefile.am. +# Makefile.in generated by automake 1.6.3 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 @@ -51,6 +51,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_HEADER = $(INSTALL_DATA) transform = @program_transform_name@ @@ -122,6 +123,10 @@ install-man1: $(man1_MANS) $(man_MANS) if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \ else file=$$i; fi; \ ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 1*) ;; \ + *) ext='1' ;; \ + esac; \ inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ inst=`echo $$inst | sed -e 's/^.*\///'`; \ inst=`echo $$inst | sed '$(transform)'`.$$ext; \ @@ -154,7 +159,7 @@ top_distdir = .. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) - @for file in $(DISTFILES); do \ + @list='$(DISTFILES)'; for file in $$list; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ @@ -164,8 +169,10 @@ distdir: $(DISTFILES) dir=''; \ fi; \ if test -d $$d/$$file; then \ - cp -pR $$d/$$file $(distdir)$$dir \ - || exit 1; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ else \ test -f $(distdir)/$$file \ || cp -p $$d/$$file $(distdir)/$$file \ @@ -198,7 +205,7 @@ mostlyclean-generic: clean-generic: distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]* + -rm -f Makefile $(CONFIG_CLEAN_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" diff --git a/doc/user.sgml b/doc/user.sgml index 61e6212..1ed0313 100644 --- a/doc/user.sgml +++ b/doc/user.sgml @@ -18,7 +18,7 @@ dgt:~$ mkdir ~/dejagnu.test dgt:~$ cd ~/dejagnu.test </programlisting> -<para>Now you are ready to test DejaGnu's main program called ruuntest. The expecteted output is shown</para> +<para>Now you are ready to test DejaGnu's main program called runtest. The expecteted output is shown</para> <example> <title>Runtest output in a empty directory @@ -550,7 +550,7 @@ This can be done by adding the following lines to our file remote_echo.exp.</par <title>A first (local) remote "Hello world" test</title> <programlisting> set test "Remote_send Hello World" -set status [remote_send $target "echo \"Hello World\"\n" ] +set status [remote_send $target "echo \"Hello\" \"World\"\n" ] pass "$test" set test "Remote_expect Hello World" remote_expect $target 5 { @@ -1609,7 +1609,7 @@ powerpc-linux-gcc -g -O2 -o calc calc.o <title>Global Config File</title> <para>The master config file is where all the target specific - config variables get set for a whole site get set. The idea is + config variables for a whole site get set. The idea is that for a centralized testing lab where people have to share a target between multiple developers. There are settings for both remote targets and remote hosts. Here's an example of a Master |