diff options
| author | Mathieu Lirzin <mthl@gnu.org> | 2017-03-14 12:19:40 +0100 |
|---|---|---|
| committer | Jim Meyering <meyering@fb.com> | 2017-03-14 11:40:53 -0700 |
| commit | f30205c5d59bab2c035165158e7d5d65b07b8363 (patch) | |
| tree | f7a4ced3f70ae3d4068d2e7c99c957b16c63c74f | |
| parent | 7da447eaa163dc6a1e5a29ef566d348dccb33131 (diff) | |
| download | gnulib-f30205c5d59bab2c035165158e7d5d65b07b8363.tar.gz | |
gnulib-tool: don't automatically distribute files from top/
* gnulib-tool (func_get_automake_snippet_unconditional): To be able to
not distribute top/README-release by default, don't distribute files
from top/ unconditionally.
* modules/gnumakefile (Makefile.am): Distribute top/GNUmakefile.
* modules/maintainer-makefile (Makefile.am): Distribute top/maint.mk.
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rwxr-xr-x | gnulib-tool | 7 | ||||
| -rw-r--r-- | modules/gnumakefile | 1 | ||||
| -rw-r--r-- | modules/maintainer-makefile | 3 |
4 files changed, 13 insertions, 7 deletions
@@ -1,3 +1,12 @@ +2017-03-14 Mathieu Lirzin <mthl@gnu.org> + + gnulib-tool: don't automatically distribute files from top/ + * gnulib-tool (func_get_automake_snippet_unconditional): To be able to + not distribute top/README-release by default, don't distribute files + from top/ unconditionally. + * modules/gnumakefile (Makefile.am): Distribute top/GNUmakefile. + * modules/maintainer-makefile (Makefile.am): Distribute top/maint.mk. + 2017-03-14 Paul Eggert <eggert@cs.ucla.edu> gnulib-tool: fix typo in comment output diff --git a/gnulib-tool b/gnulib-tool index 12a167b56f..0d1ceb242e 100755 --- a/gnulib-tool +++ b/gnulib-tool @@ -2461,13 +2461,6 @@ func_get_automake_snippet_unconditional () echo "EXTRA_DIST += "`echo "$buildaux_files" | sed -e "$sed_prepend_auxdir"` echo fi - # Synthesize an EXTRA_DIST augmentation also for the files from top/. - func_filter_filelist top_files "$nl" "$all_files" 'top/' '' 'top/' '' - if test -n "$top_files"; then - sed_prepend_topdir='s,^,$(top_srcdir)/,' - echo "EXTRA_DIST += "`echo "$top_files" | sed -e "$sed_prepend_topdir"` - echo - fi ;; esac } diff --git a/modules/gnumakefile b/modules/gnumakefile index f917e36fca..644f1e8c2d 100644 --- a/modules/gnumakefile +++ b/modules/gnumakefile @@ -19,6 +19,7 @@ m4_if(m4_version_compare([2.61a.100], [GNUmakefile=$GNUmakefile])]) Makefile.am: +EXTRA_DIST += $(top_srcdir)/GNUmakefile distclean-local: clean-GNUmakefile clean-GNUmakefile: test '$(srcdir)' = . || rm -f $(top_builddir)/GNUmakefile diff --git a/modules/maintainer-makefile b/modules/maintainer-makefile index 0045c59867..39b51583cc 100644 --- a/modules/maintainer-makefile +++ b/modules/maintainer-makefile @@ -15,6 +15,9 @@ AC_CONFIG_COMMANDS_PRE([m4_ifdef([AH_HEADER], [AC_SUBST([CONFIG_INCLUDE], m4_defn([AH_HEADER]))])]) AC_REQUIRE([AC_PROG_SED]) +Makefile.am: +EXTRA_DIST += $(top_srcdir)/maint.mk + License: GPLed build tool |