]> Savannah Git Hosting - gnulib.git/commitdiff
gnulib-tool: don't automatically distribute files from top/
authorMathieu Lirzin <mthl@gnu.org>
Tue, 14 Mar 2017 11:19:40 +0000 (12:19 +0100)
committerJim Meyering <meyering@fb.com>
Tue, 14 Mar 2017 18:40:53 +0000 (11:40 -0700)
* 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.

ChangeLog
gnulib-tool
modules/gnumakefile
modules/maintainer-makefile

index 6ae54d5e598ca03acea16414136b4f241a778740..87d6a1901b9f946145ca4037f8cb1e20569534d1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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
index 12a167b56f79dfbd990ef59cdbfbd1fb458dab2e..0d1ceb242e3a474e07f8d29944be92ce267b1dc6 100755 (executable)
@@ -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
 }
index f917e36fcad50971a665ea4df6a068f250edcdb0..644f1e8c2d7fb7d4957acd382a2758a1ea97d206 100644 (file)
@@ -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
index 0045c5986706545711be04d60d335ddd48533436..39b51583cc7a63c49df281fcd658dfb4e9b0bb36 100644 (file)
@@ -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