From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Tue, 17 Jan 2012 14:48:56 +0000 (+0100)
Subject: fixup: contrib: really integrate in automake build system
X-Git-Tag: ng-0.5a~45^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=443114bf1b15790e0349a087a5673e4de25981ff;p=thirdparty%2Fautomake.git

fixup: contrib: really integrate in automake build system

* configure.ac (AC_CONFIG_FILES): Add 'contrib/Makefile'.
* Makefile.am (SUBDIRS): Add 'contrib'.
---

diff --git a/Makefile.am b/Makefile.am
index 735cb009e..bd5b76a06 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -23,7 +23,7 @@
 ## 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
 
diff --git a/configure.ac b/configure.ac
index bc04e56d8..bcd28fda6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -206,6 +206,7 @@ AC_SUBST([sh_errexit_works], [$am_cv_sh_errexit_works])
 
 AC_CONFIG_FILES([
   Makefile
+  contrib/Makefile
   doc/Makefile
   lib/Automake/Makefile
   lib/Automake/tests/Makefile