diff options
| author | Tom Tromey <tromey@redhat.com> | 1996-11-07 22:47:12 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@redhat.com> | 1996-11-07 22:47:12 +0000 |
| commit | cbf3dc2e4213a59da987406cd949c3ce4d774082 (patch) | |
| tree | aa63efa9d50fd139b58660be104f00e8dbece8f3 /lib/am/dejagnu.am | |
| parent | 4d894165522bff535e53496b947ef876c8ab1d6b (diff) | |
| download | automake-cbf3dc2e4213a59da987406cd949c3ce4d774082.tar.gz | |
Initial draft of --cygnus mode.
Bug fixes for config.h in subdir
Diffstat (limited to 'lib/am/dejagnu.am')
| -rw-r--r-- | lib/am/dejagnu.am | 22 |
1 files changed, 5 insertions, 17 deletions
diff --git a/lib/am/dejagnu.am b/lib/am/dejagnu.am index 189394855..dbb54bf92 100644 --- a/lib/am/dejagnu.am +++ b/lib/am/dejagnu.am @@ -16,18 +16,6 @@ ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ## 02111-1307, USA. -## Work if expect is in our tree. -EXPECT = ` \ - if [ -f $$rootme/../expect/expect ] ; then \ - echo $$rootme/../expect/expect ; \ - else echo expect ; fi` - -## If DejaGNU is in our tree, we must run it out of srcdir. -RUNTEST = ` \ - if [ -f $(top_srcdir)/../dejagnu/runtest ] ; then \ - echo $(top_srcdir)/../dejagnu/runtest ; \ - else echo runtest ; fi` - ## Flags for DejaGNU. RUNTESTFLAGS = @@ -35,13 +23,13 @@ RUNTESTFLAGS = DEJATOOL = $(PACKAGE) check-DEJAGNU: site.exp - rootme=`cd $(top_builddir) && pwd`; \ ## Life is easiest with an absolute srcdir, so do that. srcdir=`cd $(srcdir) && pwd`; export srcdir; \ EXPECT=$(EXPECT); export EXPECT; \ ## Allow this to work when expect and DejaGNU are in tree. - if [ -f $$rootme/../expect/expect ]; then \ - TCL_LIBRARY=`cd $(top_srcdir)/../tcl/library && pwd`; \ - export TCL_LIBRARY; \ - fi; \ +## Only required when --cygnus in force. +CYGNUS if [ -f $(top_builddir)/../expect/expect ]; then \ +CYGNUS TCL_LIBRARY=`cd $(top_srcdir)/../tcl/library && pwd`; \ +CYGNUS export TCL_LIBRARY; \ +CYGNUS fi; \ $(RUNTEST) --tool $(DEJATOOL) --srcdir $$srcdir $(RUNTESTFLAGS) |