1998-09-27 Ben Elliston <bje@cygnus.com>

* testsuite/Makefile.in (check): If DejaGNU is not installed,
	print a warning and skip the `dejacheck' target (which will fail).
	(site.exp): Use tests to guard commands from generating error
	messages if `site.exp' or `site.bak' do not exist. Contributed by
	Karl Heuer <kwzh@gnu.org>.
This commit is contained in:
Ben Elliston 1998-09-26 07:39:39 +00:00
parent 1e65b4df8f
commit 1cf03bb8e1
2 changed files with 16 additions and 5 deletions

View File

@ -1,3 +1,11 @@
1998-09-27 Ben Elliston <bje@cygnus.com>
* testsuite/Makefile.in (check): If DejaGNU is not installed,
print a warning and skip the `dejacheck' target (which will fail).
(site.exp): Use tests to guard commands from generating error
messages if `site.exp' or `site.bak' do not exist. Contributed by
Karl Heuer <kwzh@gnu.org>.
1998-09-26 Ben Elliston <bje@cygnus.com>
* texinfo.tex: Import latest version from the FSF.

View File

@ -46,16 +46,19 @@ dejacheck:
exit 1; \
fi
check: dejacheck site.exp all
check: site.exp all
@if ($(RUNTEST) --version) >/dev/null 2>&1; then \
echo $(RUNTEST); \
$(RUNTEST) $(RUNTESTFLAGS) --tool autoconf AUTOCONF=${AUTOCONF} \
AUTOCONFFLAGS="${AUTOCONFFLAGS}" --srcdir $(srcdir)
AUTOCONFFLAGS="${AUTOCONFFLAGS}" --srcdir $(srcdir); \
else echo $(RUNTEST) not found, check skipped; fi
installcheck:
site.exp: Makefile
@echo "Making a new site.exp file..."
-@rm -f site.bak
-@mv site.exp site.bak
@test ! -f site.bak || rm -f site.bak
@test ! -f site.exp || mv site.exp site.bak
@echo "## these variables are automatically generated by make ##" > site.exp
@echo "# Do not edit here. If you wish to override these values" >> site.exp
@echo "# add them to the last section" >> site.exp
@ -63,7 +66,7 @@ site.exp: Makefile
@echo "set srcdir ${srcdir}" >> site.exp
@echo "set objdir `pwd`" >> site.exp
@echo "## All variables above are generated by configure. Do Not Edit ##" >> site.exp
-@sed '1,/^## All variables above are.*##/ d' site.bak >> site.exp
@test ! -f site.bak || sed '1,/^## All variables above are.*##/ d' site.bak >> site.exp
install: