From 738e9cb9f65a1ad281b277c14fab60d656e59d64 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sun, 7 Dec 2008 12:34:07 +0100 Subject: [PATCH] Don't use modules gnumakefile and maintainer-makefile in subdirectories. --- ChangeLog | 6 ++++++ gnulib-tool | 20 +++++++++++++++++--- 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6ff32bca1..985cb0bf2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2008-12-07 Bruno Haible + + * gnulib-tool (func_create_testdir): When building the tests + subdirectory, ignore the modules gnumakefile and maintainer-makefile. + Reported by Simon Josefsson. + 2008-12-07 Ralf Wildenhues * doc/manywarnings.texi, doc/gnulib-intro.texi: Fix typos. diff --git a/gnulib-tool b/gnulib-tool index 2e7b73dd9..679d12fe5 100755 --- a/gnulib-tool +++ b/gnulib-tool @@ -3822,7 +3822,14 @@ func_create_testdir () for module in $modules; do func_verify_module if test -n "$module"; then - func_get_autoconf_early_snippet "$module" + case $module in + gnumakefile | maintainer-makefile) + # These modules are meant to be used only in the top-level directory. + ;; + *) + func_get_autoconf_early_snippet "$module" + ;; + esac fi done \ | sed -e '/^$/d;' -e 's/AC_REQUIRE(\[\([^()]*\)\])/\1/' @@ -3857,8 +3864,15 @@ func_create_testdir () for module in $modules; do func_verify_nontests_module if test -n "$module"; then - func_get_autoconf_snippet "$module" \ - | sed -e "$sed_replace_build_aux" + case $module in + gnumakefile | maintainer-makefile) + # These modules are meant to be used only in the top-level directory. + ;; + *) + func_get_autoconf_snippet "$module" \ + | sed -e "$sed_replace_build_aux" + ;; + esac fi done echo "gl_source_base='.'" -- 2.11.0