From 86c2108d92fc3a518ae698c1b4de2713e557da0e Mon Sep 17 00:00:00 2001
From: Ralf Corsepius <ralf.corsepius@rtems.org>
Date: Fri, 4 Mar 2011 18:32:15 +0000
Subject: =?UTF-8?q?2011-03-04=09Ralf=20Cors=C3=A9pius=20<ralf.corsepius@rt?=
 =?UTF-8?q?ems.org>?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

	* Makefile.am: Merge-in make/Makefile.am.
	* configure.ac: Reflect change above.
---
 ChangeLog    |  5 +++++
 Makefile.am  | 17 ++++++++++++++++-
 configure.ac |  4 +---
 3 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index bf6fe2456d..17dee0c8d5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-03-04	Ralf Corsépius <ralf.corsepius@rtems.org>
+
+	* Makefile.am: Merge-in make/Makefile.am.
+	* configure.ac: Reflect change above.
+
 2011-03-04	Ralf Corsépius <ralf.corsepius@rtems.org>
 
 	* Makefile.maint, aclocal/rpm.m4, aclocal/rtems-top.m4,
diff --git a/Makefile.am b/Makefile.am
index 72e314980d..215c865f94 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,7 +7,7 @@
 
 ACLOCAL_AMFLAGS = -I aclocal
 
-SUBDIRS = make $(build_SUBDIRS) $(host_SUBDIRS) $(target_SUBDIRS)
+SUBDIRS = $(build_SUBDIRS) $(host_SUBDIRS) $(target_SUBDIRS)
 DIST_SUBDIRS = $(SUBDIRS)
 
 noinst_SCRIPTS = bootstrap
@@ -40,5 +40,20 @@ dist-hook:
 	  f=`echo $$a | sed 's,\.in$$,,'`; \
 	  if test -f $$f; then echo "rm $$f"; rm $$f; fi; done
 
+rtems_makedir = $(prefix)/make
+
+dist_rtems_make_DATA = make/main.cfg make/leaf.cfg
+
+EXTRA_DIST += make/host.cfg.in
+
+rtems_make_Templatesdir = $(rtems_makedir)/Templates
+
+dist_rtems_make_Templates_DATA = make/Templates/Makefile.dir \
+    make/Templates/Makefile.leaf make/Templates/Makefile.lib
+
+rtems_make_customdir = $(rtems_makedir)/custom
+
+dist_rtems_make_custom_DATA = make/custom/default.cfg
+
 include $(top_srcdir)/automake/subdirs.am
 include $(top_srcdir)/automake/host.am
diff --git a/configure.ac b/configure.ac
index 7416d73e87..6acb037556 100644
--- a/configure.ac
+++ b/configure.ac
@@ -67,8 +67,6 @@ AS_IF([test x"$enable_multilib" = x"yes"],[
 ])
 RTEMS_TARGET_CONFIG_SUBDIRS([c])
 
-AC_CONFIG_FILES([Makefile
-make/Makefile
-])
+AC_CONFIG_FILES([Makefile])
 
 AC_OUTPUT
-- 
cgit v1.2.3