projects
/
platform
/
upstream
/
automake.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'micro' into maint
[platform/upstream/automake.git]
/
t
/
ax
/
tap-setup.sh
diff --git
a/t/ax/tap-setup.sh
b/t/ax/tap-setup.sh
index
70487c3
..
3c992a3
100644
(file)
--- a/
t/ax/tap-setup.sh
+++ b/
t/ax/tap-setup.sh
@@
-1,5
+1,5
@@
#! /bin/sh
#! /bin/sh
-# Copyright (C) 2011-201
2
Free Software Foundation, Inc.
+# Copyright (C) 2011-201
3
Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@
-22,7
+22,7
@@
# Check that we are running from a proper directory: last thing we want
# is to overwrite some random user files.
# Check that we are running from a proper directory: last thing we want
# is to overwrite some random user files.
-test -f ../../
defs-static && test -f ../../defs
&& test -d ../../t \
+test -f ../../
bin/automake && test -f ../../runtest
&& test -d ../../t \
|| fatal_ "running from a wrong directory"
test ! -f Makefile.am || mv Makefile.am Makefile.am~ \
|| fatal_ "running from a wrong directory"
test ! -f Makefile.am || mv Makefile.am Makefile.am~ \
@@
-36,7
+36,7
@@
fetch_tap_driver
if test -f Makefile.am~; then
mv -f Makefile.am~ Makefile.am \
|| fatal_ "failed to restore Makefile.am"
if test -f Makefile.am~; then
mv -f Makefile.am~ Makefile.am \
|| fatal_ "failed to restore Makefile.am"
- echo 'TEST_LOG_DRIVER = $(
PERL) $(
srcdir)/tap-driver' >> Makefile.am \
+ echo 'TEST_LOG_DRIVER = $(srcdir)/tap-driver' >> Makefile.am \
|| fatal_ "failed to update Makefile.am"
$AUTOMAKE Makefile \
|| fatal_ "failed to remake Makefile.in"
|| fatal_ "failed to update Makefile.am"
$AUTOMAKE Makefile \
|| fatal_ "failed to remake Makefile.in"