From 2bca4ea3bd9217ff601e9dcd1730d4843cb3e3f8 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Tue, 11 Mar 2003 23:13:39 +0000 Subject: [PATCH] 2003-03-11 Ralf Corsepius * wrapup/Makefile.am: Reflect changes to project_libdir. --- cpukit/ChangeLog | 6 +++++- cpukit/wrapup/Makefile.am | 6 +++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog index 0a84bfde17..93f83a0c02 100644 --- a/cpukit/ChangeLog +++ b/cpukit/ChangeLog @@ -1,7 +1,11 @@ +2003-03-11 Ralf Corsepius + + * wrapup/Makefile.am: Reflect changes to project_libdir. + 2003-03-11 Ralf Corsepius * aclocal/env-rtemscpu.m4: Remove obsolete comment. - Add MULTISUBDIR to probject_libdir. + Add MULTISUBDIR to project_libdir. 2003-03-11 Ralf Corsepius diff --git a/cpukit/wrapup/Makefile.am b/cpukit/wrapup/Makefile.am index 74cb16da9e..a401c5f7c3 100644 --- a/cpukit/wrapup/Makefile.am +++ b/cpukit/wrapup/Makefile.am @@ -2,7 +2,7 @@ ## $Id$ ## -LIB = $(project_libdir)$(MULTISUBDIR)/librtemscpu$(LIB_VARIANT).a +LIB = $(project_libdir)/librtemscpu$(LIB_VARIANT).a include $(top_srcdir)/automake/multilib.am include $(top_srcdir)/automake/compile.am @@ -69,12 +69,12 @@ $(LIB): ${LIBS} ;; \ esac; \ done - test -d $(project_libdir)$(MULTISUBDIR) || $(mkinstalldirs) $(project_libdir)$(MULTISUBDIR) + test -d $(project_libdir) || $(mkinstalldirs) $(project_libdir) $(AR) rc $@ $(ARCH)/* rm -f $(ARCH)/*.$(OBJEXT) $(RANLIB) $@ -TMPINSTALL_FILES += $(project_libdir)$(MULTISUBDIR)/librtemscpu$(LIB_VARIANT).a +TMPINSTALL_FILES += $(project_libdir)/librtemscpu$(LIB_VARIANT).a all-am: $(ARCH) $(LIB) $(TMPINSTALL_FILES)