summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRalf Corsepius <ralf.corsepius@rtems.org>2011-03-06 11:03:33 +0000
committerRalf Corsepius <ralf.corsepius@rtems.org>2011-03-06 11:03:33 +0000
commit44dd5dc43885b05b1880c3fd1a1d72e9c0e80bba (patch)
tree6db914a4ef8c706cb20df656fb478eae2efe90aa
parent631180564bd9a57624413a14044a42548c2d5690 (diff)
downloadrtems-44dd5dc43885b05b1880c3fd1a1d72e9c0e80bba.tar.bz2
2011-03-06 Ralf Corsépius <ralf.corsepius@rtems.org>
* aclocal/rtems-top.m4: Add pkgdatadir. Override pkgdatadir to $(datadir)/rtems$_RTEMS_API. * Makefile.am: Install make/Templates to pkgdatadir.
-rw-r--r--ChangeLog6
-rw-r--r--Makefile.am12
-rw-r--r--aclocal/rtems-top.m42
3 files changed, 16 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 17dee0c8d5..1a53289d8b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-03-06 Ralf Corsépius <ralf.corsepius@rtems.org>
+
+ * aclocal/rtems-top.m4: Add pkgdatadir.
+ Override pkgdatadir to $(datadir)/rtems$_RTEMS_API.
+ * Makefile.am: Install make/Templates to pkgdatadir.
+
2011-03-04 Ralf Corsépius <ralf.corsepius@rtems.org>
* Makefile.am: Merge-in make/Makefile.am.
diff --git a/Makefile.am b/Makefile.am
index 215c865f94..3967faff80 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -42,14 +42,18 @@ dist-hook:
rtems_makedir = $(prefix)/make
-dist_rtems_make_DATA = make/main.cfg make/leaf.cfg
+dist_rtems_make_DATA =
+dist_rtems_make_DATA += make/main.cfg
+dist_rtems_make_DATA += make/leaf.cfg
EXTRA_DIST += make/host.cfg.in
-rtems_make_Templatesdir = $(rtems_makedir)/Templates
+rtems_make_Templatesdir = $(pkgdatadir)/make/Templates
-dist_rtems_make_Templates_DATA = make/Templates/Makefile.dir \
- make/Templates/Makefile.leaf make/Templates/Makefile.lib
+dist_rtems_make_Templates_DATA =
+dist_rtems_make_Templates_DATA += make/Templates/Makefile.dir
+dist_rtems_make_Templates_DATA += make/Templates/Makefile.leaf
+dist_rtems_make_Templates_DATA += make/Templates/Makefile.lib
rtems_make_customdir = $(rtems_makedir)/custom
diff --git a/aclocal/rtems-top.m4 b/aclocal/rtems-top.m4
index 147455c04b..c6acfd1081 100644
--- a/aclocal/rtems-top.m4
+++ b/aclocal/rtems-top.m4
@@ -31,4 +31,6 @@ AC_SUBST(PROJECT_ROOT)
AC_MSG_CHECKING([for RTEMS Version])
AC_MSG_RESULT([_RTEMS_VERSION])
+pkgdatadir="${datadir}"/rtems[]_RTEMS_API;
+AC_SUBST([pkgdatadir])
])dnl