diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2018-07-04 20:42:07 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2018-07-04 20:42:51 -0700 |
| commit | 60e8b9303d8ce312bb2322d4801ed08678f93d1e (patch) | |
| tree | 3e9e5fa2f0931c28fe522d8afb6f84d7728e72eb /gnulib-tool | |
| parent | a078b8cd57b007c3820c5f43a89b31bc579cbb63 (diff) | |
| download | gnulib-60e8b9303d8ce312bb2322d4801ed08678f93d1e.tar.gz | |
gnulib-tool: minor tweaks for --gnu-make
* gnulib-tool: Do not allow --gnu-make in test modes,
since they all require automake.
(func_emit_lib_Makefile_am): Don’t emit automake comment
if --gnu-make.
Diffstat (limited to 'gnulib-tool')
| -rwxr-xr-x | gnulib-tool | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/gnulib-tool b/gnulib-tool index 447505f6f4..fcc585cb07 100755 --- a/gnulib-tool +++ b/gnulib-tool @@ -1490,6 +1490,11 @@ func_determine_path_separator if test -z "$pobase" && test -n "$po_domain"; then func_warning "--po-domain has no effect without a --po-base option" fi + case $mode,$gnu_make in + *test*,true) + echo "gnulib-tool: --gnu-make not supported when including tests" + func_exit 1;; + esac # Canonicalize the inctests variable. case "$mode" in import | add-import | remove-import | update) @@ -3512,7 +3517,8 @@ func_emit_lib_Makefile_am () sed_transform_check_PROGRAMS="$sed_noop" fi echo "## DO NOT EDIT! GENERATED AUTOMATICALLY!" - echo "## Process this file with automake to produce Makefile.in." + $gnu_make || + echo "## Process this file with automake to produce Makefile.in." func_emit_copyright_notice if test -n "$actioncmd"; then # The maximum line length (excluding the terminating newline) of any file |