[Automake-commit] [SCM] GNU Automake branch, maint, updated. v1.11-751-ge9927ea

[Stefano Lattarini]

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=e9927ea32d8fe5056123b021ff771cb906b1b3df

The branch, maint has been updated
       via  e9927ea32d8fe5056123b021ff771cb906b1b3df (commit)
      from  650dba0873f6c894461ce29cb26a1b3104287d24 (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 e9927ea32d8fe5056123b021ff771cb906b1b3df
Author: Stefano Lattarini <address@hidden>
Date:   Mon Mar 12 14:41:04 2012 +0100

    coverage: an empty foo_PRIMARY should create directory $(foodir)
    
    For example, a Makefile.am containing the definition:
    
      pkgdata_DATA =
    
    should cause the 'install' rule of the generated Makefile.in to
    create the '$(pkgdatadir)' directory (respecting any DESTDIR
    setting as well).
    
    Suggestion by Peter Breitenlohner in automake bug#10997.
    
    Signed-off-by: Stefano Lattarini <address@hidden>

-----------------------------------------------------------------------

Summary of changes:
 tests/{instdir-cond.test => instdir-empty.test} |   41 ++++++++++++++---------
 tests/list-of-tests.mk                          |    1 +
 2 files changed, 26 insertions(+), 16 deletions(-)
 copy tests/{instdir-cond.test => instdir-empty.test} (58%)

diff --git a/tests/instdir-cond.test b/tests/instdir-empty.test
similarity index 58%
copy from tests/instdir-cond.test
copy to tests/instdir-empty.test
index 8d83f88..f699583 100644
--- a/tests/instdir-cond.test
+++ b/tests/instdir-empty.test
@@ -14,36 +14,45 @@
 # 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 against automake bug#10997: directories holding only
-# conditionally-installed files should not be created unconditionally.
+# An empty "foo_PRIMARY" declaration should cause "make install" to create
+# directory $(foodir).  Suggested in discussion on automake bug#10997.
 
 . ./defs || Exit 1
 
 set -e
 
-cat >> configure.in << 'END'
-AM_CONDITIONAL([ENABLE_FOO], [false])
-AC_OUTPUT
-END
-
-: > foo
-: > bar
+echo AC_OUTPUT >> configure.in
 
 cat > Makefile.am << 'END'
-if ENABLE_FOO
-pkgdata_DATA = foo
-pkglibexec_SCRIPTS = bar
-endif
+pkgdata_DATA =
+libexec_SCRIPTS =
 END
 
 $ACLOCAL
 $AUTOMAKE
 $AUTOCONF
 
-./configure --prefix="`pwd`/inst"
+cwd=`pwd`
+./configure --prefix="$cwd/inst"
 
 $MAKE install
-test ! -d inst/share/instdir-cond
-test ! -d inst/libexec/instdir-cond
+test -d inst/share/$me
+test -d inst/libexec
+rm -rf inst
+
+$MAKE install-exec
+test ! -d inst/share
+test -d inst/libexec
+rm -rf inst
+
+$MAKE install-data
+test -d inst/share/$me
+test ! -d inst/libexec
+rm -rf inst
+
+./configure --prefix=/foo
+$MAKE install DESTDIR=$cwd/dest
+test -d dest/foo/share/$me
+test -d dest/foo/libexec
 
 :
diff --git a/tests/list-of-tests.mk b/tests/list-of-tests.mk
index 7fd0376..0ee0711 100644
--- a/tests/list-of-tests.mk
+++ b/tests/list-of-tests.mk
@@ -460,6 +460,7 @@ instdat2.test \
 instdir.test \
 instdir2.test \
 instdir-cond.test \
+instdir-empty.test \
 instdir-java.test \
 instdir-lisp.test \
 instdir-ltlib.test \


hooks/post-receive
-- 
GNU Automake