Tag
Hash :
9618da20
Author :
Date :
2001-05-14T04:48:45
2001-05-13 Tom Tromey <tromey@redhat.com> * tests/defs: Find files to copy in lib/. * automake.in (perllibdir): Set to Automake directory. * ansi2knr.c, ansi2knr.1: Removed. * Makefile.am (dist_am_DATA): Removed. (amdir): Removed. (maintainer-check): Look for lib/am/*.am. Expect 28 lines of diffs. (scriptdir): Removed. (dist_script_DATA): Likewise. (install-data-hook): Likewise. (installcheck-local): Likewise. (TAGS_FILES): Removed amfiles. (dist_pkgdata_DATA): Removed ansi2knr.c and ansi2knr.1. * tests/installsh.test (AUTOMAKE): Use --libdir, not --amdir, and point it to the right directory. * ansi2knr.am, check.am, clean-hdr.am, clean.am, comp-vars.am, compile.am, configure.am, data.am, dejagnu.am, depend.am, depend2.am, distdir.am, footer.am, header-vars.am, header.am, install.am, java.am, lang-compile.am, lex.am, library.am, libs.am, libtool.am, lisp.am, ltlib.am, ltlibrary.am, mans-vars.am, mans.am, multilib.am, program.am, progs.am, python.am, remake-hdr.am, scripts.am, subdirs.am, tags.am, texi-vers.am, texibuild.am, texinfos.am, yacc.am: Moved to lib/am/. * configure.in (AC_OUTPUT): Added lib/am/Makefile. (AUTOMAKE): Use --libdir, not --amdir. Ues AC_CONFIG_AUX_DIR. * lib/Makefile.am (SUBDIRS): Added `am'. (scriptdir): New macro. (dist_script_DATA): Likewise. (dist_pkgdata_DATA): Likewise. (install-data-hook): New target. (installcheck-local): Likewise. * lib/am/Makefile.in: New file. * lib/am/Makefile.am: Removed everything except amdir and dist_am_DATA. 2001-05-13 Akim Demaille <akim@epita.fr> * automake.in ($pkgdata_dir): Rename as... ($libdir): this. ($am_dir): Remove, replace it's uses with $libdir. (&parse_arguments): Replace --amdir with --libdir. * automake.texi (Invoking Automake): Document --libdir, not --amdir. * tests/defs (AUTOMAKE): Use --libdir, not --amdir.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38
#! /bin/sh
# Test for this bug:
# automake: Makefile.am: required file "../../install-sh" not found; installing
# This also makes sure that install-sh is created in the correct directory.
. $srcdir/defs || exit 1
: > Makefile.am
rm -f install-sh
# Since the default path includes '../..', we must run this test in
# yet another subdir.
mkdir frob
mv Makefile.am configure.in mkinstalldirs frob/
cd frob
# If srcdir is relative, we need to modify it.
case "$srcdir" in
/*)
;;
*)
srcdir="../$srcdir"
;;
esac
AUTOMAKE="$PERL ../../../automake --libdir=$srcdir/../lib --foreign"
# Now we proceed with the test
$AUTOMAKE --add-missing > output 2>&1 \
|| exit 1
# Only one `/' should appear in the output.
grep '/.*/' output \
&& exit 1
test -f install-sh