From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Wed, 15 Feb 2012 18:32:07 +0000 (+0100)
Subject: Merge branch 'maint'
X-Git-Tag: ng-0.5a~9^2~12
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e05e1beda210998a42625662b852f995d5b2e82a;p=thirdparty%2Fautomake.git

Merge branch 'maint'

* maint:
  fixup: distribute 'lib/update-copyright'
---

e05e1beda210998a42625662b852f995d5b2e82a
diff --cc lib/Makefile.am
index a7c8295ce,9ef9cc7b2..d9197d5d2
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@@ -28,25 -25,12 +28,25 @@@ dist_pkgvdata_DATA = 
  ## These must all be executable when installed.  However, if we use
  ## _SCRIPTS, then the program transform will be applied, which is not
  ## what we want.  So we make them executable by hand.
 -scriptdir = $(pkgvdatadir)
 -dist_script_DATA = config.guess config.sub install-sh mdate-sh missing \
 -  mkinstalldirs elisp-comp ylwrap acinstall depcomp compile py-compile \
 -  symlink-tree
 +dist_script_DATA = \
 +  config.guess \
 +  config.sub \
 +  install-sh \
 +  mdate-sh \
 +  missing \
 +  mkinstalldirs \
 +  elisp-comp \
 +  ylwrap \
 +  acinstall \
 +  depcomp \
 +  compile \
 +  py-compile \
 +  ar-lib \
 +  test-driver \
 +  tap-driver.sh \
 +  tap-driver.pl
  
- EXTRA_DIST = gnupload gitlog-to-changelog
+ EXTRA_DIST = gnupload gitlog-to-changelog update-copyright
  
  install-data-hook:
  	@$(POST_INSTALL)