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 735cb009e9e6d94c29467985d181272ac684f971..bd5b76a069ea5d603b5ee8711948cf647cea0500 100644 (file)
--- 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 bc04e56d87c8dff4554135922986d35410055883..bcd28fda632dc5e550740a9f2488f6d51382d2b8 100644 (file)
--- 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