Simon Josefsson and Ralf Wildenhues wrote on 2008-11-29:
> > I'd prefer the latter (I don't think GNUmakefile belongs in
> > non-top-level directories) but don't know how to achieve it.
>
> Thanks for checking; I agree with the analysis, and that gltests
> shouldn't contain GNUmakefile nor the configure.ac snippet from
> modules/gnumakefile.
Implemented as follows:
2008-12-07 Bruno Haible <[EMAIL PROTECTED]>
* gnulib-tool (func_create_testdir): When building the tests
subdirectory, ignore the modules gnumakefile and maintainer-makefile.
Reported by Simon Josefsson.
*** gnulib-tool.orig 2008-12-07 12:32:33.000000000 +0100
--- gnulib-tool 2008-12-07 12:29:32.000000000 +0100
***************
*** 3822,3828 ****
for module in $modules; do
func_verify_module
if test -n "$module"; then
! func_get_autoconf_early_snippet "$module"
fi
done \
| sed -e '/^$/d;' -e 's/AC_REQUIRE(\[\([^()]*\)\])/\1/'
--- 3822,3835 ----
for module in $modules; do
func_verify_module
if test -n "$module"; then
! 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,3864 ****
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"
fi
done
echo "gl_source_base='.'"
--- 3864,3878 ----
for module in $modules; do
func_verify_nontests_module
if test -n "$module"; then
! 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='.'"
