diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2003-07-15 15:07:23 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2003-07-15 15:07:23 +0000 |
| commit | 69b40b058b63a24a10c0ed3348f347cceb65ae16 (patch) | |
| tree | 6a1ea4b02068a9025b3c0fff3b4cb9937be6166d /cpukit | |
| parent | 2003-07-15 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff) | |
| download | rtems-69b40b058b63a24a10c0ed3348f347cceb65ae16.tar.bz2 | |
2003-07-15 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* wrapup/Makefile.am: Remove bogus $(MULTISUBDIR).
Diffstat (limited to 'cpukit')
| -rw-r--r-- | cpukit/ChangeLog | 4 | ||||
| -rw-r--r-- | cpukit/wrapup/Makefile.am | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog index f1e306f733..7ba254336e 100644 --- a/cpukit/ChangeLog +++ b/cpukit/ChangeLog @@ -1,3 +1,7 @@ +2003-07-15 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + + * wrapup/Makefile.am: Remove bogus $(MULTISUBDIR). + 2003-07-08 Ralf Corsepius <corsepiu@faw.uni-ulm.de> * configure.ac: Merge-in librpc/configure.ac. 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) |