diff options
| author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-12-30 12:12:27 +0100 |
|---|---|---|
| committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-12-30 12:51:22 +0100 |
| commit | 78e1c8e561d71ae70b2d014a758502c9dc523a95 (patch) | |
| tree | 703834a427bd60a99e480fe6e18c3bb9682a307c /t/pr401b.sh | |
| parent | 45b9b03e2285710997e625893f2250139b05c8d8 (diff) | |
| parent | de1ce8f594a41b839641b401702f8f52896eadc4 (diff) | |
| download | automake-78e1c8e561d71ae70b2d014a758502c9dc523a95.tar.gz | |
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 <stefano.lattarini@gmail.com>
Diffstat (limited to 't/pr401b.sh')
| -rwxr-xr-x | t/pr401b.sh | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/t/pr401b.sh b/t/pr401b.sh index cde992079..b57f32f49 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 |