summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefano Lattarini <stefano.lattarini@gmail.com>2012-01-17 15:48:56 +0100
committerStefano Lattarini <stefano.lattarini@gmail.com>2012-01-17 15:48:56 +0100
commit443114bf1b15790e0349a087a5673e4de25981ff (patch)
treee3f6bc3d165d6b07cd0d235158f795faf26dc73f
parente29c49181fb4ffa2506ca690964b5e9e07c8fb49 (diff)
downloadautomake-443114bf1b15790e0349a087a5673e4de25981ff.tar.gz
fixup: contrib: really integrate in automake build system
* configure.ac (AC_CONFIG_FILES): Add 'contrib/Makefile'. * Makefile.am (SUBDIRS): Add 'contrib'.
-rw-r--r--Makefile.am2
-rw-r--r--configure.ac1
2 files changed, 2 insertions, 1 deletions
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