From 75b6353009b794d21ba40934ad6603cf509a4c1b Mon Sep 17 00:00:00 2001 From: Ralf Wildenhues Date: Wed, 28 Mar 2007 21:57:54 +0000 Subject: [PATCH] * TODO: Kill a couple of outdated items. * tests/exdir3.test: New test. * tests/Makefile.am: Update. --- ChangeLog | 6 ++++++ TODO | 8 +------- tests/Makefile.am | 1 + tests/Makefile.in | 1 + tests/exdir3.test | 41 +++++++++++++++++++++++++++++++++++++++++ 5 files changed, 50 insertions(+), 7 deletions(-) create mode 100755 tests/exdir3.test diff --git a/ChangeLog b/ChangeLog index 81e1c9918..dedc87bd9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2007-03-28 Ralf Wildenhues + + * TODO: Kill a couple of outdated items. + * tests/exdir3.test: New test. + * tests/Makefile.am: Update. + 2007-01-27 Bruno Haible * doc/automake.texi (Multiple Outputs): Fix the multiple outputs diff --git a/TODO b/TODO index 2f6aa2ac5..1340fb50a 100644 --- a/TODO +++ b/TODO @@ -4,10 +4,6 @@ run, and that will therefore always create %DIR% (unless %DIR%dir is also defined conditionally). Likewise, installdirs should not create %DIR% in conditions were no %DIR%_%PRIMARY% is enabled. -we can't seem to AC_SUBST(pkgdatadir) -the version from header-vars overrides -why is that? - check should depend on all from ben elliston @@ -123,8 +119,6 @@ Alex Hornby * per-exe flags ** LIBOBJS shouldn't be used when there are per-exe flags (?) -* Support subdir-objects with fortran - * Allow creation of Java .zip/.jar files in natural way If you are building a compiled Java library, then the .zip/.jar ought to be made automatically. @@ -220,7 +214,7 @@ might make editing conceptually easier. * clean up source directory by moving stuff into subdirs -* consider adding pkglibexecdir, maybe others? +* consider adding other variables similar to pkglibexecdir? requests for pkg-dirs with version included Avoid loops when installing; instead unroll them in automake diff --git a/tests/Makefile.am b/tests/Makefile.am index d2136b1e2..508d68849 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -227,6 +227,7 @@ empty3.test \ empty4.test \ exdir.test \ exdir2.test \ +exdir3.test \ exeext.test \ exeext2.test \ exeext3.test \ diff --git a/tests/Makefile.in b/tests/Makefile.in index ba635c9d3..6bd2fec55 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -360,6 +360,7 @@ empty3.test \ empty4.test \ exdir.test \ exdir2.test \ +exdir3.test \ exeext.test \ exeext2.test \ exeext3.test \ diff --git a/tests/exdir3.test b/tests/exdir3.test new file mode 100755 index 000000000..0127c0616 --- /dev/null +++ b/tests/exdir3.test @@ -0,0 +1,41 @@ +#! /bin/sh +# Copyright (C) 2006 Free Software Foundation, Inc. +# +# This file is part of GNU Automake. +# +# GNU Automake 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, or (at your option) +# any later version. +# +# GNU Automake 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 Automake; see the file COPYING. If not, write to +# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +# Boston, MA 02110-1301, USA. + +# Test to make sure pkgdatadir can be overridden via AC_SUBST. + +. ./defs || exit 1 + +set -e + +cat >>configure.in <<'EOF' +AC_SUBST([pkgdatadir], ["FOO"]) +AC_OUTPUT +EOF + +cat > Makefile.am << 'EOF' +showme: + @echo $(pkgdatadir) +EOF + +$ACLOCAL +$AUTOCONF +$AUTOMAKE +./configure +$MAKE showme | grep FOO -- 2.47.2