* TODO: Kill a couple of outdated items.

* tests/exdir3.test: New test.
* tests/Makefile.am: Update.

diff --git a/ChangeLog b/ChangeLog
index 81e1c99185e4ba0e15f6375febce24f470c136c4..dedc87bd9ac472f28191ea2a7cb1508b855c7149 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-03-28  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+       * TODO: Kill a couple of outdated items.
+       * tests/exdir3.test: New test.
+       * tests/Makefile.am: Update.
+
 2007-01-27 Bruno Haible  <bruno@clisp.org>
 
        * doc/automake.texi (Multiple Outputs): Fix the multiple outputs

diff --git a/TODO b/TODO
index 2f6aa2ac509a663392a200dee186b0995a182eb0..1340fb50a94520dca3afee07cfb466fd06a95d34 100644 (file)
--- 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 d2136b1e226ca02247ca05e179349a3b1d46fe1f..508d68849aaec418848d1ec0fabe49c2571381e4 100644 (file)
--- 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 ba635c9d389a560a00ae957028ac63caf92f730f..6bd2fec55873e80dea69da41a8904dfbf20aa0df 100644 (file)
--- 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 (executable)
index 0000000..0127c06
--- /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