[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Automake-commit] [SCM] GNU Automake branch, ng/master, updated. v1.13-7
|
From: |
Stefano Lattarini |
|
Subject: |
[Automake-commit] [SCM] GNU Automake branch, ng/master, updated. v1.13-750-g78e1c8e |
|
Date: |
Sun, 30 Dec 2012 12:00:38 +0000 |
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Automake".
http://git.sv.gnu.org/gitweb/?p=automake.git;a=commitdiff;h=78e1c8e561d71ae70b2d014a758502c9dc523a95
The branch, ng/master has been updated
via 78e1c8e561d71ae70b2d014a758502c9dc523a95 (commit)
via de1ce8f594a41b839641b401702f8f52896eadc4 (commit)
via 3e35245c5f6aae5594b00ffe3611a4955d115be5 (commit)
via c5fe4fdfb0d4ece2f47d6b7dabf3371fc15af6d7 (commit)
via d01834bc91bff6773dcd73d70158974c45d9d8e5 (commit)
via d11e8cb529c3f9b847b03261c5bd6e74122a9eaf (commit)
via bd7b811d6d3d13f88bde3c06c94f2314cf238f5c (commit)
via 6899085918b1673131e5451c39390b76ba273540 (commit)
via 9c07d8926ec97d43f1f811706043e5398ef916cf (commit)
via 8e921bf86103578b56b2910590c7f1157e96e380 (commit)
via 2e269cff5425cded47fb9f5578102dee0ac12dc9 (commit)
via 08db0c420204dd07ca96a6d2f9c892c5a608ac49 (commit)
from 45b9b03e2285710997e625893f2250139b05c8d8 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 78e1c8e561d71ae70b2d014a758502c9dc523a95
Merge: 45b9b03 de1ce8f
Author: Stefano Lattarini <address@hidden>
Date: Sun Dec 30 12:12:27 2012 +0100
Merge branch 'master' into ng/master
* master:
fixup: copyright yars in two recent tests
obsolete: fixup: don't use AU_DEFUN where AC_DEFUN is required
obsolete: better error message if AM_PROG_MKDIR_P is used
NEWS: document removal of AM_PROG_MKDIR_P macro
NEWS: minor fixup
obsolete: better error message if AM_PROG_CC_STDC is used
obsolete: better error message if AM_CONFIG_HEADER is used
sync: update files from upstream with "make fetch"
tests: better names for temporary configure.ac files
Signed-off-by: Stefano Lattarini <address@hidden>
-----------------------------------------------------------------------
Summary of changes:
Makefile.am | 1 +
NEWS | 19 ++++++-
lib/config.guess | 26 ++++-----
lib/config.sub | 33 +++++------
m4/obsolete-err.m4 | 29 ++++++++++
...no-top-level.sh => am-config-header-no-more.sh} | 41 ++++++--------
...-no-top-level.sh => am-prog-cc-stdc-no-more.sh} | 41 ++++++--------
t/{spy-phony.sh => am-prog-mkdir-p-no-more.sh} | 59 ++++++++------------
t/cond42.sh | 13 ++--
t/cond43.sh | 4 +-
t/pr401.sh | 12 ++--
t/pr401b.sh | 12 ++--
t/pr401c.sh | 12 ++--
t/python11.sh | 4 +-
14 files changed, 161 insertions(+), 145 deletions(-)
create mode 100644 m4/obsolete-err.m4
copy t/{recurs-user-no-top-level.sh => am-config-header-no-more.sh} (63%)
copy t/{recurs-user-no-top-level.sh => am-prog-cc-stdc-no-more.sh} (58%)
copy t/{spy-phony.sh => am-prog-mkdir-p-no-more.sh} (56%)
diff --git a/Makefile.am b/Makefile.am
index 0373386..076b7c2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -256,6 +256,7 @@ dist_automake_ac_DATA = \
m4/lispdir.m4 \
m4/minuso.m4 \
m4/missing.m4 \
+ m4/obsolete-err.m4 \
m4/options.m4 \
m4/python.m4 \
m4/runlog.m4 \
diff --git a/NEWS b/NEWS
index faf79fd..ac723af 100644
--- a/NEWS
+++ b/NEWS
@@ -22,6 +22,13 @@ New in 1.14:
* Obsolete features removed:
+ - The long-obsolete (since automake 1.10) AM_PROG_MKDIR m4 macro has
+ been removed. The $(mkdir_p) make variable and the @mkdir_p@
+ substitutionl still remains available for the moment, as aliases
+ of $(MKDIR_P), for better backward compatibility; but you are
+ advised to stop using ASAP, as they might be removed in future
+ Automake versions.
+
- Support for the long-deprecated name 'configure.in' for the Autoconf
input file has been removed altogether. Just use the modern name
'configure.ac' instead.
@@ -47,7 +54,7 @@ New in 1.14:
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-New in 1.13:
+New in 1.13.1:
* WARNING: Future backward-incompatibilities!
@@ -100,6 +107,16 @@ New in 1.13:
* Bugs fixed:
+ - Use of the obsolete macros AM_CONFIG_HEADER or AM_PROG_CC_STDC now
+ causes a clear and helpful error message, instead of obscure ones
+ (issue introduced in Automake 1.13).
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+New in 1.13:
+
+* Bugs fixed:
+
- ylwrap renames properly header guards in generated header files
(*.h), instead of leaving Y_TAB_H.
diff --git a/lib/config.guess b/lib/config.guess
index 872b96a..1804e9f 100755
--- a/lib/config.guess
+++ b/lib/config.guess
@@ -2,13 +2,13 @@
# Attempt to guess a canonical system name.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
-# 2011, 2012 Free Software Foundation, Inc.
+# 2011, 2012, 2013 Free Software Foundation, Inc.
-timestamp='2012-09-25'
+timestamp='2012-12-29'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful, but
@@ -22,19 +22,17 @@ timestamp='2012-09-25'
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-
-# Originally written by Per Bothner. Please send patches (context
-# diff format) to <address@hidden> and include a ChangeLog
-# entry.
+# the same distribution terms that you use for the rest of that
+# program. This Exception is an additional permission under section 7
+# of the GNU General Public License, version 3 ("GPLv3").
#
-# This script attempts to guess a canonical system name similar to
-# config.sub. If it succeeds, it prints the system name on stdout, and
-# exits with 0. Otherwise, it exits with 1.
+# Originally written by Per Bothner.
#
# You can get the latest version of this script from:
#
http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+#
+# Please send patches with a ChangeLog entry to address@hidden
+
me=`echo "$0" | sed -e 's,.*/,,'`
@@ -55,8 +53,8 @@ GNU config.guess ($timestamp)
Originally written by Per Bothner.
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
-Free Software Foundation, Inc.
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011,
+2012, 2013 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
diff --git a/lib/config.sub b/lib/config.sub
index 8df5511..802a224 100755
--- a/lib/config.sub
+++ b/lib/config.sub
@@ -2,23 +2,19 @@
# Configuration validation subroutine script.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
-# 2011, 2012 Free Software Foundation, Inc.
+# 2011, 2012, 2013 Free Software Foundation, Inc.
-timestamp='2012-12-06'
+timestamp='2012-12-29'
-# This file is (in principle) common to ALL GNU software.
-# The presence of a machine in this file suggests that SOME GNU software
-# can handle that machine. It does not imply ALL GNU software can.
-#
-# This file is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# This file is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, see <http://www.gnu.org/licenses/>.
@@ -26,11 +22,12 @@ timestamp='2012-12-06'
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
+# the same distribution terms that you use for the rest of that
+# program. This Exception is an additional permission under section 7
+# of the GNU General Public License, version 3 ("GPLv3").
-# Please send patches to <address@hidden>. Submit a context
-# diff and a properly formatted GNU ChangeLog entry.
+# Please send patches with a ChangeLog entry to address@hidden
#
# Configuration subroutine to validate and canonicalize a configuration type.
# Supply the specified configuration type as an argument.
@@ -74,8 +71,8 @@ version="\
GNU config.sub ($timestamp)
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
-Free Software Foundation, Inc.
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011,
+2012, 2013 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
diff --git a/m4/obsolete-err.m4 b/m4/obsolete-err.m4
new file mode 100644
index 0000000..77dab8c
--- /dev/null
+++ b/m4/obsolete-err.m4
@@ -0,0 +1,29 @@
+# -*- Autoconf -*-
+# Obsolete and "removed" macros, that must however still report explicit
+# error messages when used, to smooth transition.
+#
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+AC_DEFUN([AM_CONFIG_HEADER],
+[AC_FATAL(['$0': this macro is obsolete.
+ You should use the 'AC][_CONFIG_HEADERS' macro instead.])])
+
+AC_DEFUN([AM_PROG_CC_STDC],
+[AC_FATAL(['$0': this macro is obsolete.
+ You should simply use the 'AC][_PROG_CC' macro instead.
+ Also, your code should no longer depend upon 'am_cv_prog_cc_stdc',
+ but upon 'ac_cv_prog_cc_stdc'.])])
+
+AC_DEFUN([AM_PROG_MKDIR_P],
+[AC_FATAL(['$0': this macro is obsolete.
+ You should simply use the 'AC][_PROG_MKDIR_P' macro instead, and
+ use '$(MKDIR_P)' instead of '$(mkdir_p)' in your Makefile.am
+ files.])])
+
+AC_DEFUN([AM_C_PROTOTYPES],
+ [AC_FATAL([automatic de-ANSI-fication support has been removed])])
+AU_DEFUN([fp_C_PROTOTYPES], [AM_C_PROTOTYPES])
diff --git a/t/recurs-user-no-top-level.sh b/t/am-config-header-no-more.sh
similarity index 63%
copy from t/recurs-user-no-top-level.sh
copy to t/am-config-header-no-more.sh
index 1546f1c..f100e93 100755
--- a/t/recurs-user-no-top-level.sh
+++ b/t/am-config-header-no-more.sh
@@ -14,37 +14,30 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-# Check that user recursion works even for targets that don't exist
-# in the top-level Makefile.
+# Check that any attempt to use the obsolete macro AM_CONFIG_HEADER
+# elicits clear and explicit fatal errors.
. test-init.sh
-cat >> configure.ac <<'END'
-AC_CONFIG_FILES([sub/Makefile])
-AM_EXTRA_RECURSIVE_TARGETS([foo-bar])
-AC_OUTPUT
-END
+geterr ()
+{
+ "$@" -Wnone 2>stderr && { cat stderr >&2; exit 1; }
+ cat stderr >&2
+ grep "^configure\.ac:4:.*'AM_CONFIG_HEADER'.*obsolete" stderr
+ grep "'AC_CONFIG_HEADERS'.* instead" stderr
+}
-mkdir sub
-
-cat > Makefile.am <<'END'
-SUBDIRS = sub
-all-local: foo-bar
-END
+$ACLOCAL
+mv aclocal.m4 aclocal.sav
-cat > sub/Makefile.am <<'END'
-foo-bar-local:
- : > foo-bar
-MOSTLYCLEANFILES = foo-bar
-END
+echo AM_CONFIG_HEADER >> configure.ac
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE
+geterr $ACLOCAL
+test ! -f aclocal.m4
-./configure
+cat aclocal.sav "$am_automake_acdir"/obsolete-err.m4 > aclocal.m4
-$MAKE foo-bar
-test -f sub/foo-bar
+geterr $AUTOCONF
+geterr $AUTOMAKE
:
diff --git a/t/recurs-user-no-top-level.sh b/t/am-prog-cc-stdc-no-more.sh
similarity index 58%
copy from t/recurs-user-no-top-level.sh
copy to t/am-prog-cc-stdc-no-more.sh
index 1546f1c..447be37 100755
--- a/t/recurs-user-no-top-level.sh
+++ b/t/am-prog-cc-stdc-no-more.sh
@@ -14,37 +14,30 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-# Check that user recursion works even for targets that don't exist
-# in the top-level Makefile.
+# Check that any attempt to use the obsolete macro AM_CONFIG_HEADER
+# elicits clear and explicit fatal errors.
. test-init.sh
-cat >> configure.ac <<'END'
-AC_CONFIG_FILES([sub/Makefile])
-AM_EXTRA_RECURSIVE_TARGETS([foo-bar])
-AC_OUTPUT
-END
+geterr ()
+{
+ "$@" -Wnone 2>stderr && { cat stderr >&2; exit 1; }
+ cat stderr >&2
+ grep "^configure\.ac:4:.*'AM_PROG_CC_STDC'.*obsolete" stderr
+ grep "'AC_PROG_CC'.* instead" stderr
+}
-mkdir sub
-
-cat > Makefile.am <<'END'
-SUBDIRS = sub
-all-local: foo-bar
-END
+$ACLOCAL
+mv aclocal.m4 aclocal.sav
-cat > sub/Makefile.am <<'END'
-foo-bar-local:
- : > foo-bar
-MOSTLYCLEANFILES = foo-bar
-END
+echo AM_PROG_CC_STDC >> configure.ac
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE
+geterr $ACLOCAL
+test ! -f aclocal.m4
-./configure
+cat aclocal.sav "$am_automake_acdir"/obsolete-err.m4 > aclocal.m4
-$MAKE foo-bar
-test -f sub/foo-bar
+geterr $AUTOCONF
+geterr $AUTOMAKE
:
diff --git a/t/spy-phony.sh b/t/am-prog-mkdir-p-no-more.sh
similarity index 56%
copy from t/spy-phony.sh
copy to t/am-prog-mkdir-p-no-more.sh
index 1bd3c10..4a2e615 100755
--- a/t/spy-phony.sh
+++ b/t/am-prog-mkdir-p-no-more.sh
@@ -14,44 +14,31 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-# Check that the '.PHONY' semantics we expect truly hold.
+# Check that any attempt to use the obsolete macro AM_PROG_MKDIR_P
+# elicits clear and explicit fatal errors.
-am_create_testdir=empty
. test-init.sh
-cat > Makefile <<'END'
-.PHONY: pdir pfile
-pdir rdir:
- echo foo > $@/foo
-pfile rfile:
- echo bar >$@
-.PHONY: other
-other:
- echo baz >> dummy
-indirect: other
- echo run > $@
-END
-
-: > rfile
-mkdir rdir
-$MAKE rdir rfile
-test ! -s rfile
-test ! -f rdir/foo
-
-: > pfile
-mkdir pdir
-$MAKE pdir pfile
-test "$(cat pfile)" = bar
-test "$(cat pdir/foo)" = foo
-
-$MAKE other
-test "$(cat dummy)" = baz
-$MAKE other
-test "$(cat dummy)" = "baz${nl}baz"
-
-echo not run > indirect
-$MAKE indirect
-test "$(cat indirect)" = run
-test "$(cat dummy)" = "baz${nl}baz${nl}baz"
+geterr ()
+{
+ "$@" -Wnone 2>stderr && { cat stderr >&2; exit 1; }
+ cat stderr >&2
+ grep "^configure\.ac:4:.*'AM_PROG_MKDIR_P'.*obsolete" stderr
+ grep "'AC_PROG_MKDIR_P'.* instead" stderr
+ grep " use '\$(MKDIR_P)' instead of '\$(mkdir_p)'.*Makefile" stderr
+}
+
+$ACLOCAL
+mv aclocal.m4 aclocal.sav
+
+echo AM_PROG_MKDIR_P >> configure.ac
+
+geterr $ACLOCAL
+test ! -f aclocal.m4
+
+cat aclocal.sav "$am_automake_acdir"/obsolete-err.m4 > aclocal.m4
+
+geterr $AUTOCONF
+geterr $AUTOMAKE
:
diff --git a/t/cond42.sh b/t/cond42.sh
index b3d0305..f90341d 100755
--- a/t/cond42.sh
+++ b/t/cond42.sh
@@ -1,4 +1,5 @@
#!/bin/sh
+nfig
# Copyright (C) 2008-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
@@ -28,10 +29,10 @@ _AM_COND_IF([COND])
AC_OUTPUT
END
-edit_configure_in ()
+edit_configure_ac ()
{
- sed "$@" < configure.ac >configure.int
- mv -f configure.int configure.ac
+ sed "$@" < configure.ac >configure.tmp
+ mv -f configure.tmp configure.ac
rm -rf autom4te*.cache
}
@@ -41,15 +42,15 @@ $ACLOCAL
AUTOMAKE_fails
grep '^configure\.ac:8:.* condition stack' stderr
-edit_configure_in 's/_AM_COND_IF/_AM_COND_ELSE/'
+edit_configure_ac 's/_AM_COND_IF/_AM_COND_ELSE/'
AUTOMAKE_fails
grep '^configure\.ac:7:.* else without if' stderr
-edit_configure_in 's/_AM_COND_ELSE/_AM_COND_ENDIF/'
+edit_configure_ac 's/_AM_COND_ELSE/_AM_COND_ENDIF/'
AUTOMAKE_fails
grep '^configure\.ac:7:.* endif without if' stderr
-edit_configure_in 's/\(_AM_COND_ENDIF\).*/_AM_COND_IF\
+edit_configure_ac 's/\(_AM_COND_ENDIF\).*/_AM_COND_IF\
_AM_COND_ENDIF/'
AUTOMAKE_fails
grep '^configure\.ac:7:.* not enough arguments.* _AM_COND_IF' stderr
diff --git a/t/cond43.sh b/t/cond43.sh
index ff33675..c5da21c 100755
--- a/t/cond43.sh
+++ b/t/cond43.sh
@@ -36,8 +36,8 @@ $EGREP '^configure\.ac:7:.* missing m4 quoting.*macro depth
2( |$)' stderr
sed '/.AM_COND_IF/{
s/^/[/
s/$/]/
- }' < configure.ac > configure.int
-mv -f configure.int configure.ac
+ }' < configure.ac > configure.tmp
+mv -f configure.tmp configure.ac
rm -rf autom4te*.cache
$AUTOMAKE
diff --git a/t/pr401.sh b/t/pr401.sh
index be67a53..3156f1f 100755
--- a/t/pr401.sh
+++ b/t/pr401.sh
@@ -93,8 +93,8 @@ $MAKE distcheck
# Invocation of AC_CONFIG_LIBOBJ_DIR may be necessary for reasons
# unrelated to Automake or Makefile.am layout.
-sed 's/#: //' configure.ac >configure.int
-mv -f configure.int configure.ac
+sed 's/#: //' configure.ac >configure.tmp
+mv -f configure.tmp configure.ac
$ACLOCAL
$AUTOCONF
@@ -107,8 +107,8 @@ $MAKE distcheck
## Test using LIBOBJS from a sibling directory. ##
## -------------------------------------------- ##
-sed 's/#x //; s/lib\/Makefile //' configure.ac >configure.int
-mv -f configure.int configure.ac
+sed 's/#x //; s/lib\/Makefile //' configure.ac >configure.tmp
+mv -f configure.tmp configure.ac
cat >Makefile.am <<'EOF'
SUBDIRS = src
@@ -142,8 +142,8 @@ $MAKE distclean
## Test using LIBOBJS from parent directory. ##
## ----------------------------------------- ##
-sed 's/^.*src\/Makefile.*$//' configure.ac >configure.int
-mv -f configure.int configure.ac
+sed 's/^.*src\/Makefile.*$//' configure.ac >configure.tmp
+mv -f configure.tmp configure.ac
cat >Makefile.am <<'EOF'
noinst_LIBRARIES = lib/libfeep.a
diff --git a/t/pr401b.sh b/t/pr401b.sh
index cde9920..b57f32f 100755
--- a/t/pr401b.sh
+++ b/t/pr401b.sh
@@ -94,8 +94,8 @@ $MAKE distcheck
# Invocation of AC_CONFIG_LIBOBJ_DIR may be necessary for reasons
# unrelated to Automake or Makefile.am layout.
-sed 's/#: //' configure.ac >configure.int
-mv -f configure.int configure.ac
+sed 's/#: //' configure.ac >configure.tmp
+mv -f configure.tmp configure.ac
$ACLOCAL
$AUTOCONF
@@ -109,8 +109,8 @@ $MAKE distcheck
## Test using LTLIBOBJS from a sibling directory. ##
## ---------------------------------------------- ##
-sed 's/#x //; s/lib\/Makefile //' configure.ac >configure.int
-mv -f configure.int configure.ac
+sed 's/#x //; s/lib\/Makefile //' configure.ac >configure.tmp
+mv -f configure.tmp configure.ac
cat >Makefile.am <<'EOF'
SUBDIRS = src
@@ -144,8 +144,8 @@ $MAKE distclean
## Test using LTLIBOBJS from parent directory. ##
## ------------------------------------------- ##
-sed 's/^.*src\/Makefile.*$//' configure.ac >configure.int
-mv -f configure.int configure.ac
+sed 's/^.*src\/Makefile.*$//' configure.ac >configure.tmp
+mv -f configure.tmp configure.ac
cat >Makefile.am <<'EOF'
noinst_LTLIBRARIES = lib/libfeep.la
diff --git a/t/pr401c.sh b/t/pr401c.sh
index 34c4450..6f4a315 100755
--- a/t/pr401c.sh
+++ b/t/pr401c.sh
@@ -95,8 +95,8 @@ $MAKE distcheck
# Invocation of AC_CONFIG_LIBOBJ_DIR may be necessary for reasons
# unrelated to Automake or Makefile.am layout.
-sed 's/#: //' configure.ac >configure.int
-mv -f configure.int configure.ac
+sed 's/#: //' configure.ac >configure.tmp
+mv -f configure.tmp configure.ac
$ACLOCAL
$AUTOCONF
@@ -110,8 +110,8 @@ $MAKE distcheck
## Test using ALLOCA from a sibling directory. ##
## ------------------------------------------- ##
-sed 's/#x //; s/lib\/Makefile //' configure.ac >configure.int
-mv -f configure.int configure.ac
+sed 's/#x //; s/lib\/Makefile //' configure.ac >configure.tmp
+mv -f configure.tmp configure.ac
cat >Makefile.am <<'EOF'
SUBDIRS = src
@@ -145,8 +145,8 @@ $MAKE distclean
## Test using ALLOCA from parent directory. ##
## ---------------------------------------- ##
-sed 's/^.*src\/Makefile.*$//' configure.ac >configure.int
-mv -f configure.int configure.ac
+sed 's/^.*src\/Makefile.*$//' configure.ac >configure.tmp
+mv -f configure.tmp configure.ac
cat >Makefile.am <<'EOF'
noinst_LIBRARIES = lib/libfeep.a
diff --git a/t/python11.sh b/t/python11.sh
index a648c7b..e316b27 100755
--- a/t/python11.sh
+++ b/t/python11.sh
@@ -43,8 +43,8 @@ grep 'checking for IShouldNotExist1' stdout
grep 'checking for IShouldNotExist2' stdout
grep 'no suitable Python interpreter found' stderr
-sed 's/AM_PATH_PYTHON/AM_PATH_PYTHON(,,:)/' configure.ac >configure.int
-mv -f configure.int configure.ac
+sed 's/AM_PATH_PYTHON/AM_PATH_PYTHON(,,:)/' configure.ac >configure.tmp
+mv -f configure.tmp configure.ac
$ACLOCAL --force
$AUTOCONF --force
# This one should define PYTHON as ":" and exit successfully.
hooks/post-receive
--
GNU Automake
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Automake-commit] [SCM] GNU Automake branch, ng/master, updated. v1.13-750-g78e1c8e,
Stefano Lattarini <=