summaryrefslogtreecommitdiff
path: root/t/remake-after-aclocal-m4.sh
diff options
context:
space:
mode:
Diffstat (limited to 't/remake-after-aclocal-m4.sh')
-rw-r--r--t/remake-after-aclocal-m4.sh11
1 files changed, 2 insertions, 9 deletions
diff --git a/t/remake-after-aclocal-m4.sh b/t/remake-after-aclocal-m4.sh
index 4116b3159..8cc51ced6 100644
--- a/t/remake-after-aclocal-m4.sh
+++ b/t/remake-after-aclocal-m4.sh
@@ -22,12 +22,6 @@
magic1=::MagicStringOne::
magic2=__MagicStringTwo__
-if using_gmake; then
- remake_() { $MAKE nil; }
-else
- remake_() { $MAKE Makefile && $MAKE foo.sh; }
-fi
-
cat >> configure.ac <<END
FINGERPRINT='my_fingerprint'
AC_SUBST([FINGERPRINT])
@@ -81,7 +75,7 @@ for vpath in : false; do
$sleep
echo "AC_DEFUN([my_fingerprint], [$magic1])dnl %%%" >> $srcdir/aclocal.m4
- remake_
+ $MAKE nil
$FGREP FINGERPRINT Makefile # For debugging.
$FGREP $magic1 Makefile
test x"$(./foo.sh)" = x"$magic1"
@@ -89,7 +83,7 @@ for vpath in : false; do
$sleep
echo "sed 's/.*dnl *%%%.*/AC_DEFUN([my_fingerprint], [$magic2])/'" \
> $srcdir/tweak-aclocal-m4
- remake_
+ $MAKE nil
$FGREP FINGERPRINT Makefile # For debugging.
$FGREP $magic1 Makefile && exit 1
$FGREP $magic2 Makefile
@@ -98,7 +92,6 @@ for vpath in : false; do
$sleep
echo cat > $srcdir/tweak-aclocal-m4 # Make it a no-op again.
echo 'AC_DEFUN([my_fingerprint], [DummyValue])' >> $srcdir/aclocal.m4
- using_gmake || remake_
$MAKE distcheck
$FGREP $magic1 Makefile && exit 1 # Sanity check.
$FGREP $magic2 Makefile && exit 1 # Likewise.