[PATCH] trivial fix to provide MULTISUBDIR for libsupc++ makefile

[Chris G. Demetriou]

I just committed the following (under the 'trivial' rules 8-).
(Alas, I didn't know of libstdc++@gcc.gnu.org when i first sent the
patch a couple of weeks ago.)

Tested by building for a (multilibbed) mips-elf -like target (slightly
different name, and other local configury hacks, but otherwise
mips-elf), and verifying that indeed, the various libsupc++.a
libraries were installed in the right places.


cgd

------- Start of forwarded message -------
From: cgd@sibyte.com (Chris G. Demetriou)
Newsgroups: mlist.gnu.gcc.patches
Subject: trivial fix to provide MULTISUBDIR for libsupc++ makefile
Date: 8 Jan 2001 18:37:21 -0800
Organization: none given
Message-ID: <mailpost.979007835.15000@postal.sibyte.com>
References: <yov53det8n9z.fsf@highland.sibyte.com>
To: gcc-patches@gcc.gnu.org

When doing a multilibbed build of libstdc++-v3/libsupc++, MULTISUBDIR
needs to be set in the Makefile by libstdc++-v3/configure so that the
libsupc++ library gets installed in the correct place.

This is already done for libstdc++-v3/src.  Obviously, the result of
not doing it for libsupc++ is that all libsupc++ libraries are
installed in the same place ("he who writes last, writes best!" 8-).


The problem was noticed on a mips64-elf-like target, and the fix below
checked on the same.


for libstdc++-v3/ChangeLog:

2001-01-08  Chris Demetriou  <cgd@sibyte.com>

	* configure.in: Place definition of MULTISUBDIR in libsupc++
	Makefiles if appropriate.
	* configure: Regenerate.


FYI: Note that my employer disclaimer is probably no longer valid, due
to the recent acquisition that SiByte underwent.  I've told
assign@gnu.org about it, but this is a trivial patch and so it
shouldn't matter.  (I've submitted no new non-trivial patches since we
were acquired, and I won't do so until the new paperwork is ironed
out, so it's not a big issue, but figured y'all should know.)
Anyway...


chris
===================================================================
Index: configure.in
===================================================================
RCS file: /cvsroot/systemsw/tools/src/gcc/libstdc++-v3/configure.in,v
retrieving revision 1.1.1.2
diff -c -r1.1.1.2 configure.in
*** configure.in	2001/01/04 00:30:34	1.1.1.2
--- configure.in	2001/01/09 00:49:48
***************
*** 297,310 ****
  fi
  
  # NB: Multilibs need MULTISUBDIR defined correctly in src/Makefile.am
! # so that multilib installs will end up installed in the correct
! # place. To work around this not being passed down from config-ml.in
! # -> top_srcdir/Makefile.am -> top_srcdir/src/Makefile.am, manually
! # append it here.
  AC_OUTPUT(tests_flags mkcheck Makefile src/Makefile libmath/Makefile libio/Makefile libsupc++/Makefile,
  [if test -n "$CONFIG_FILES"; then
    ac_file=Makefile . ${glibcpp_basedir}/../config-ml.in
    grep '^MULTISUBDIR =' Makefile >> src/Makefile
  fi
  chmod +x tests_flags
  chmod +x mkcheck
--- 297,311 ----
  fi
  
  # NB: Multilibs need MULTISUBDIR defined correctly in src/Makefile.am
! # and libsupc++/Makefile.am so that multilib installs will end up
! # installed in the correct place. To work around this not being passed
! # down from config-ml.in -> top_srcdir/Makefile.am ->
! # top_srcdir/{src,libsupc++}/Makefile.am, manually append it here.
  AC_OUTPUT(tests_flags mkcheck Makefile src/Makefile libmath/Makefile libio/Makefile libsupc++/Makefile,
  [if test -n "$CONFIG_FILES"; then
    ac_file=Makefile . ${glibcpp_basedir}/../config-ml.in
    grep '^MULTISUBDIR =' Makefile >> src/Makefile
+   grep '^MULTISUBDIR =' Makefile >> libsupc++/Makefile
  fi
  chmod +x tests_flags
  chmod +x mkcheck

------- End of forwarded message -------