summaryrefslogtreecommitdiffstats
path: root/cpukit
diff options
context:
space:
mode:
authorRalf Corsepius <ralf.corsepius@rtems.org>2002-12-12 17:56:50 +0000
committerRalf Corsepius <ralf.corsepius@rtems.org>2002-12-12 17:56:50 +0000
commit16f417c1167b22a0728bad9c1595af34507f006c (patch)
tree8a86bcc4a108e834e3a415c97b3f7e533d6f6f05 /cpukit
parent2002-12-12 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff)
downloadrtems-16f417c1167b22a0728bad9c1595af34507f006c.tar.bz2
2002-12-12 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* wrapup/Makefile.am: Don't create $ARCH. Use install-data-local to install librtemscpu.a
Diffstat (limited to 'cpukit')
-rw-r--r--cpukit/ChangeLog5
-rw-r--r--cpukit/wrapup/Makefile.am8
2 files changed, 9 insertions, 4 deletions
diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog
index 781641a6a3..4d30e044ef 100644
--- a/cpukit/ChangeLog
+++ b/cpukit/ChangeLog
@@ -1,5 +1,10 @@
2002-12-12 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+ * wrapup/Makefile.am: Don't create $ARCH.
+ Use install-data-local to install librtemscpu.a
+
+2002-12-12 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
* wrapup/Makefile.am: Add libmisc.
2002-12-12 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
diff --git a/cpukit/wrapup/Makefile.am b/cpukit/wrapup/Makefile.am
index e42e9686e0..90c98227c2 100644
--- a/cpukit/wrapup/Makefile.am
+++ b/cpukit/wrapup/Makefile.am
@@ -45,7 +45,6 @@ endif
$(LIB): ${LIBS}
rm -f $@
- test -d $(ARCH) || mkdir $(ARCH)
rm -rf $(ARCH)/*
for f in $(LIBS); do \
case $$f in \
@@ -77,9 +76,10 @@ $(LIB): ${LIBS}
TMPINSTALL_FILES += $(project_libdir)$(MULTISUBDIR)/librtemscpu$(LIB_VARIANT).a
-cpulibdir = $(libdir)
-cpulib_DATA = $(LIB)
+all-am: $(ARCH) $(LIB) $(TMPINSTALL_FILES)
-all-local: ${ARCH} $(TMPINSTALL_FILES)
+install-data-hook: $(LIB)
+ $(mkinstalldir) $(DESTDIR)/$(libdir)
+ $(INSTALL_DATA) $(LIB) $(DESTDIR)/$(libdir)
include $(top_srcdir)/automake/local.am