From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Tue, 17 Jan 2012 14:52:53 +0000 (+0100)
Subject: Merge branch 'maint'
X-Git-Tag: ng-0.5a~45
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f4298e61d0d9d2a87e8a43edd4aa7133455c5d7b;p=thirdparty%2Fautomake.git

Merge branch 'maint'

* maint:
  fixup: contrib: really integrate in automake build system
---

f4298e61d0d9d2a87e8a43edd4aa7133455c5d7b
diff --cc Makefile.am
index ab57068ce,bd5b76a06..0b7e091d6
--- a/Makefile.am
+++ b/Makefile.am
@@@ -23,9 -23,9 +23,9 @@@
  ## automake (run in doc, tests, and in the rebuild rules.)
  ## `.' goes before doc and tests, because the latter two directories
  ## run aclocal and automake.
- SUBDIRS = lib . doc m4 tests
+ SUBDIRS = lib . contrib doc m4 tests
  
 -TEST_SUBDIRS = tests lib/Automake/tests
 +TEST_SUBDIRS = lib/Automake/tests tests
  
  bin_SCRIPTS = automake aclocal