From 5e26fb96689e1e732fd556966172624212542558 Mon Sep 17 00:00:00 2001
From: "David E. O'Brien" <obrien@FreeBSD.org>
Date: Sun, 28 Feb 1999 12:18:36 +0000
Subject: [PATCH] Support building libstdc++ shared if "WANT_SHAREDLIBS" is
 defined.

Submitted by:	dfr
---
 lang/egcs/Makefile      | 9 ++++++++-
 lang/gcc-devel/Makefile | 9 ++++++++-
 lang/gcc-ooo/Makefile   | 9 ++++++++-
 lang/gcc/Makefile       | 9 ++++++++-
 lang/gcc295/Makefile    | 9 ++++++++-
 lang/gcc30/Makefile     | 9 ++++++++-
 lang/gcc31/Makefile     | 9 ++++++++-
 lang/gcc32/Makefile     | 9 ++++++++-
 lang/gcc33/Makefile     | 9 ++++++++-
 lang/gcc34/Makefile     | 9 ++++++++-
 lang/gcc35/Makefile     | 9 ++++++++-
 lang/gcc40/Makefile     | 9 ++++++++-
 lang/gcc41/Makefile     | 9 ++++++++-
 lang/gcc42/Makefile     | 9 ++++++++-
 lang/gcc43/Makefile     | 9 ++++++++-
 lang/gcc44/Makefile     | 9 ++++++++-
 lang/gcc45/Makefile     | 9 ++++++++-
 lang/gcc46/Makefile     | 9 ++++++++-
 lang/gcc47/Makefile     | 9 ++++++++-
 lang/gcc48/Makefile     | 9 ++++++++-
 20 files changed, 160 insertions(+), 20 deletions(-)

diff --git a/lang/egcs/Makefile b/lang/egcs/Makefile
index b834dcef9903..d0534238b138 100644
--- a/lang/egcs/Makefile
+++ b/lang/egcs/Makefile
@@ -4,7 +4,7 @@
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.45 1999/02/09 22:17:21 obrien Exp $
+# $Id: Makefile,v 1.46 1999/02/28 10:50:50 obrien Exp $
 #
 
 DISTNAME=	egcs-1.1.2-pre2
@@ -41,6 +41,9 @@ GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 CONFIGURE_ARGS=	--with-gnu-as --with-gnu-ld ${GNUHOST} \
 		--with-gxx-include-dir=${PREFIX}/lib/gcc-lib/${GNUHOST}/${EGCS_REV}/include/g++
+.if defined(WANT_SHAREDLIBS)
+CONFIGURE_ARGS+= --enable-shared
+.endif
 ALL_TARGET=	bootstrap
 MAN1=		cccp.1 g++.1 g77.1 gcc.1
 
@@ -89,6 +92,10 @@ post-install:
 		${PREFIX}/lib/gcc-lib/${GNUHOST}/${EGCS_REV}
 	${MV} -f ${PREFIX}/lib/libstdc++.a  \
 		${PREFIX}/lib/gcc-lib/${GNUHOST}/${EGCS_REV}/libstdc++.a
+.if defined(WANT_SHAREDLIBS)
+	${MV} -f ${PREFIX}/lib/libstdc++.so*  \
+		${PREFIX}/lib/gcc-lib/${GNUHOST}/${EGCS_REV}
+.endif
 	if [ ! -f ${PREFIX}/info/dir ]; then \
 	    ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
 	fi
diff --git a/lang/gcc-devel/Makefile b/lang/gcc-devel/Makefile
index b834dcef9903..d0534238b138 100644
--- a/lang/gcc-devel/Makefile
+++ b/lang/gcc-devel/Makefile
@@ -4,7 +4,7 @@
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.45 1999/02/09 22:17:21 obrien Exp $
+# $Id: Makefile,v 1.46 1999/02/28 10:50:50 obrien Exp $
 #
 
 DISTNAME=	egcs-1.1.2-pre2
@@ -41,6 +41,9 @@ GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 CONFIGURE_ARGS=	--with-gnu-as --with-gnu-ld ${GNUHOST} \
 		--with-gxx-include-dir=${PREFIX}/lib/gcc-lib/${GNUHOST}/${EGCS_REV}/include/g++
+.if defined(WANT_SHAREDLIBS)
+CONFIGURE_ARGS+= --enable-shared
+.endif
 ALL_TARGET=	bootstrap
 MAN1=		cccp.1 g++.1 g77.1 gcc.1
 
@@ -89,6 +92,10 @@ post-install:
 		${PREFIX}/lib/gcc-lib/${GNUHOST}/${EGCS_REV}
 	${MV} -f ${PREFIX}/lib/libstdc++.a  \
 		${PREFIX}/lib/gcc-lib/${GNUHOST}/${EGCS_REV}/libstdc++.a
+.if defined(WANT_SHAREDLIBS)
+	${MV} -f ${PREFIX}/lib/libstdc++.so*  \
+		${PREFIX}/lib/gcc-lib/${GNUHOST}/${EGCS_REV}
+.endif
 	if [ ! -f ${PREFIX}/info/dir ]; then \
 	    ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
 	fi
diff --git a/lang/gcc-ooo/Makefile b/lang/gcc-ooo/Makefile
index b834dcef9903..d0534238b138 100644
--- a/lang/gcc-ooo/Makefile
+++ b/lang/gcc-ooo/Makefile
@@ -4,7 +4,7 @@
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.45 1999/02/09 22:17:21 obrien Exp $
+# $Id: Makefile,v 1.46 1999/02/28 10:50:50 obrien Exp $
 #
 
 DISTNAME=	egcs-1.1.2-pre2
@@ -41,6 +41,9 @@ GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 CONFIGURE_ARGS=	--with-gnu-as --with-gnu-ld ${GNUHOST} \
 		--with-gxx-include-dir=${PREFIX}/lib/gcc-lib/${GNUHOST}/${EGCS_REV}/include/g++
+.if defined(WANT_SHAREDLIBS)
+CONFIGURE_ARGS+= --enable-shared
+.endif
 ALL_TARGET=	bootstrap
 MAN1=		cccp.1 g++.1 g77.1 gcc.1
 
@@ -89,6 +92,10 @@ post-install:
 		${PREFIX}/lib/gcc-lib/${GNUHOST}/${EGCS_REV}
 	${MV} -f ${PREFIX}/lib/libstdc++.a  \
 		${PREFIX}/lib/gcc-lib/${GNUHOST}/${EGCS_REV}/libstdc++.a
+.if defined(WANT_SHAREDLIBS)
+	${MV} -f ${PREFIX}/lib/libstdc++.so*  \
+		${PREFIX}/lib/gcc-lib/${GNUHOST}/${EGCS_REV}
+.endif
 	if [ ! -f ${PREFIX}/info/dir ]; then \
 	    ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
 	fi
diff --git a/lang/gcc/Makefile b/lang/gcc/Makefile
index b834dcef9903..d0534238b138 100644
--- a/lang/gcc/Makefile
+++ b/lang/gcc/Makefile
@@ -4,7 +4,7 @@
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.45 1999/02/09 22:17:21 obrien Exp $
+# $Id: Makefile,v 1.46 1999/02/28 10:50:50 obrien Exp $
 #
 
 DISTNAME=	egcs-1.1.2-pre2
@@ -41,6 +41,9 @@ GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 CONFIGURE_ARGS=	--with-gnu-as --with-gnu-ld ${GNUHOST} \
 		--with-gxx-include-dir=${PREFIX}/lib/gcc-lib/${GNUHOST}/${EGCS_REV}/include/g++
+.if defined(WANT_SHAREDLIBS)
+CONFIGURE_ARGS+= --enable-shared
+.endif
 ALL_TARGET=	bootstrap
 MAN1=		cccp.1 g++.1 g77.1 gcc.1
 
@@ -89,6 +92,10 @@ post-install:
 		${PREFIX}/lib/gcc-lib/${GNUHOST}/${EGCS_REV}
 	${MV} -f ${PREFIX}/lib/libstdc++.a  \
 		${PREFIX}/lib/gcc-lib/${GNUHOST}/${EGCS_REV}/libstdc++.a
+.if defined(WANT_SHAREDLIBS)
+	${MV} -f ${PREFIX}/lib/libstdc++.so*  \
+		${PREFIX}/lib/gcc-lib/${GNUHOST}/${EGCS_REV}
+.endif
 	if [ ! -f ${PREFIX}/info/dir ]; then \
 	    ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
 	fi
diff --git a/lang/gcc295/Makefile b/lang/gcc295/Makefile
index b834dcef9903..d0534238b138 100644
--- a/lang/gcc295/Makefile
+++ b/lang/gcc295/Makefile
@@ -4,7 +4,7 @@
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.45 1999/02/09 22:17:21 obrien Exp $
+# $Id: Makefile,v 1.46 1999/02/28 10:50:50 obrien Exp $
 #
 
 DISTNAME=	egcs-1.1.2-pre2
@@ -41,6 +41,9 @@ GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 CONFIGURE_ARGS=	--with-gnu-as --with-gnu-ld ${GNUHOST} \
 		--with-gxx-include-dir=${PREFIX}/lib/gcc-lib/${GNUHOST}/${EGCS_REV}/include/g++
+.if defined(WANT_SHAREDLIBS)
+CONFIGURE_ARGS+= --enable-shared
+.endif
 ALL_TARGET=	bootstrap
 MAN1=		cccp.1 g++.1 g77.1 gcc.1
 
@@ -89,6 +92,10 @@ post-install:
 		${PREFIX}/lib/gcc-lib/${GNUHOST}/${EGCS_REV}
 	${MV} -f ${PREFIX}/lib/libstdc++.a  \
 		${PREFIX}/lib/gcc-lib/${GNUHOST}/${EGCS_REV}/libstdc++.a
+.if defined(WANT_SHAREDLIBS)
+	${MV} -f ${PREFIX}/lib/libstdc++.so*  \
+		${PREFIX}/lib/gcc-lib/${GNUHOST}/${EGCS_REV}
+.endif
 	if [ ! -f ${PREFIX}/info/dir ]; then \
 	    ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
 	fi
diff --git a/lang/gcc30/Makefile b/lang/gcc30/Makefile
index b834dcef9903..d0534238b138 100644
--- a/lang/gcc30/Makefile
+++ b/lang/gcc30/Makefile
@@ -4,7 +4,7 @@
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.45 1999/02/09 22:17:21 obrien Exp $
+# $Id: Makefile,v 1.46 1999/02/28 10:50:50 obrien Exp $
 #
 
 DISTNAME=	egcs-1.1.2-pre2
@@ -41,6 +41,9 @@ GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 CONFIGURE_ARGS=	--with-gnu-as --with-gnu-ld ${GNUHOST} \
 		--with-gxx-include-dir=${PREFIX}/lib/gcc-lib/${GNUHOST}/${EGCS_REV}/include/g++
+.if defined(WANT_SHAREDLIBS)
+CONFIGURE_ARGS+= --enable-shared
+.endif
 ALL_TARGET=	bootstrap
 MAN1=		cccp.1 g++.1 g77.1 gcc.1
 
@@ -89,6 +92,10 @@ post-install:
 		${PREFIX}/lib/gcc-lib/${GNUHOST}/${EGCS_REV}
 	${MV} -f ${PREFIX}/lib/libstdc++.a  \
 		${PREFIX}/lib/gcc-lib/${GNUHOST}/${EGCS_REV}/libstdc++.a
+.if defined(WANT_SHAREDLIBS)
+	${MV} -f ${PREFIX}/lib/libstdc++.so*  \
+		${PREFIX}/lib/gcc-lib/${GNUHOST}/${EGCS_REV}
+.endif
 	if [ ! -f ${PREFIX}/info/dir ]; then \
 	    ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
 	fi
diff --git a/lang/gcc31/Makefile b/lang/gcc31/Makefile
index b834dcef9903..d0534238b138 100644
--- a/lang/gcc31/Makefile
+++ b/lang/gcc31/Makefile
@@ -4,7 +4,7 @@
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.45 1999/02/09 22:17:21 obrien Exp $
+# $Id: Makefile,v 1.46 1999/02/28 10:50:50 obrien Exp $
 #
 
 DISTNAME=	egcs-1.1.2-pre2
@@ -41,6 +41,9 @@ GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 CONFIGURE_ARGS=	--with-gnu-as --with-gnu-ld ${GNUHOST} \
 		--with-gxx-include-dir=${PREFIX}/lib/gcc-lib/${GNUHOST}/${EGCS_REV}/include/g++
+.if defined(WANT_SHAREDLIBS)
+CONFIGURE_ARGS+= --enable-shared
+.endif
 ALL_TARGET=	bootstrap
 MAN1=		cccp.1 g++.1 g77.1 gcc.1
 
@@ -89,6 +92,10 @@ post-install:
 		${PREFIX}/lib/gcc-lib/${GNUHOST}/${EGCS_REV}
 	${MV} -f ${PREFIX}/lib/libstdc++.a  \
 		${PREFIX}/lib/gcc-lib/${GNUHOST}/${EGCS_REV}/libstdc++.a
+.if defined(WANT_SHAREDLIBS)
+	${MV} -f ${PREFIX}/lib/libstdc++.so*  \
+		${PREFIX}/lib/gcc-lib/${GNUHOST}/${EGCS_REV}
+.endif
 	if [ ! -f ${PREFIX}/info/dir ]; then \
 	    ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
 	fi
diff --git a/lang/gcc32/Makefile b/lang/gcc32/Makefile
index b834dcef9903..d0534238b138 100644
--- a/lang/gcc32/Makefile
+++ b/lang/gcc32/Makefile
@@ -4,7 +4,7 @@
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.45 1999/02/09 22:17:21 obrien Exp $
+# $Id: Makefile,v 1.46 1999/02/28 10:50:50 obrien Exp $
 #
 
 DISTNAME=	egcs-1.1.2-pre2
@@ -41,6 +41,9 @@ GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 CONFIGURE_ARGS=	--with-gnu-as --with-gnu-ld ${GNUHOST} \
 		--with-gxx-include-dir=${PREFIX}/lib/gcc-lib/${GNUHOST}/${EGCS_REV}/include/g++
+.if defined(WANT_SHAREDLIBS)
+CONFIGURE_ARGS+= --enable-shared
+.endif
 ALL_TARGET=	bootstrap
 MAN1=		cccp.1 g++.1 g77.1 gcc.1
 
@@ -89,6 +92,10 @@ post-install:
 		${PREFIX}/lib/gcc-lib/${GNUHOST}/${EGCS_REV}
 	${MV} -f ${PREFIX}/lib/libstdc++.a  \
 		${PREFIX}/lib/gcc-lib/${GNUHOST}/${EGCS_REV}/libstdc++.a
+.if defined(WANT_SHAREDLIBS)
+	${MV} -f ${PREFIX}/lib/libstdc++.so*  \
+		${PREFIX}/lib/gcc-lib/${GNUHOST}/${EGCS_REV}
+.endif
 	if [ ! -f ${PREFIX}/info/dir ]; then \
 	    ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
 	fi
diff --git a/lang/gcc33/Makefile b/lang/gcc33/Makefile
index b834dcef9903..d0534238b138 100644
--- a/lang/gcc33/Makefile
+++ b/lang/gcc33/Makefile
@@ -4,7 +4,7 @@
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.45 1999/02/09 22:17:21 obrien Exp $
+# $Id: Makefile,v 1.46 1999/02/28 10:50:50 obrien Exp $
 #
 
 DISTNAME=	egcs-1.1.2-pre2
@@ -41,6 +41,9 @@ GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 CONFIGURE_ARGS=	--with-gnu-as --with-gnu-ld ${GNUHOST} \
 		--with-gxx-include-dir=${PREFIX}/lib/gcc-lib/${GNUHOST}/${EGCS_REV}/include/g++
+.if defined(WANT_SHAREDLIBS)
+CONFIGURE_ARGS+= --enable-shared
+.endif
 ALL_TARGET=	bootstrap
 MAN1=		cccp.1 g++.1 g77.1 gcc.1
 
@@ -89,6 +92,10 @@ post-install:
 		${PREFIX}/lib/gcc-lib/${GNUHOST}/${EGCS_REV}
 	${MV} -f ${PREFIX}/lib/libstdc++.a  \
 		${PREFIX}/lib/gcc-lib/${GNUHOST}/${EGCS_REV}/libstdc++.a
+.if defined(WANT_SHAREDLIBS)
+	${MV} -f ${PREFIX}/lib/libstdc++.so*  \
+		${PREFIX}/lib/gcc-lib/${GNUHOST}/${EGCS_REV}
+.endif
 	if [ ! -f ${PREFIX}/info/dir ]; then \
 	    ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
 	fi
diff --git a/lang/gcc34/Makefile b/lang/gcc34/Makefile
index b834dcef9903..d0534238b138 100644
--- a/lang/gcc34/Makefile
+++ b/lang/gcc34/Makefile
@@ -4,7 +4,7 @@
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.45 1999/02/09 22:17:21 obrien Exp $
+# $Id: Makefile,v 1.46 1999/02/28 10:50:50 obrien Exp $
 #
 
 DISTNAME=	egcs-1.1.2-pre2
@@ -41,6 +41,9 @@ GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 CONFIGURE_ARGS=	--with-gnu-as --with-gnu-ld ${GNUHOST} \
 		--with-gxx-include-dir=${PREFIX}/lib/gcc-lib/${GNUHOST}/${EGCS_REV}/include/g++
+.if defined(WANT_SHAREDLIBS)
+CONFIGURE_ARGS+= --enable-shared
+.endif
 ALL_TARGET=	bootstrap
 MAN1=		cccp.1 g++.1 g77.1 gcc.1
 
@@ -89,6 +92,10 @@ post-install:
 		${PREFIX}/lib/gcc-lib/${GNUHOST}/${EGCS_REV}
 	${MV} -f ${PREFIX}/lib/libstdc++.a  \
 		${PREFIX}/lib/gcc-lib/${GNUHOST}/${EGCS_REV}/libstdc++.a
+.if defined(WANT_SHAREDLIBS)
+	${MV} -f ${PREFIX}/lib/libstdc++.so*  \
+		${PREFIX}/lib/gcc-lib/${GNUHOST}/${EGCS_REV}
+.endif
 	if [ ! -f ${PREFIX}/info/dir ]; then \
 	    ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
 	fi
diff --git a/lang/gcc35/Makefile b/lang/gcc35/Makefile
index b834dcef9903..d0534238b138 100644
--- a/lang/gcc35/Makefile
+++ b/lang/gcc35/Makefile
@@ -4,7 +4,7 @@
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.45 1999/02/09 22:17:21 obrien Exp $
+# $Id: Makefile,v 1.46 1999/02/28 10:50:50 obrien Exp $
 #
 
 DISTNAME=	egcs-1.1.2-pre2
@@ -41,6 +41,9 @@ GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 CONFIGURE_ARGS=	--with-gnu-as --with-gnu-ld ${GNUHOST} \
 		--with-gxx-include-dir=${PREFIX}/lib/gcc-lib/${GNUHOST}/${EGCS_REV}/include/g++
+.if defined(WANT_SHAREDLIBS)
+CONFIGURE_ARGS+= --enable-shared
+.endif
 ALL_TARGET=	bootstrap
 MAN1=		cccp.1 g++.1 g77.1 gcc.1
 
@@ -89,6 +92,10 @@ post-install:
 		${PREFIX}/lib/gcc-lib/${GNUHOST}/${EGCS_REV}
 	${MV} -f ${PREFIX}/lib/libstdc++.a  \
 		${PREFIX}/lib/gcc-lib/${GNUHOST}/${EGCS_REV}/libstdc++.a
+.if defined(WANT_SHAREDLIBS)
+	${MV} -f ${PREFIX}/lib/libstdc++.so*  \
+		${PREFIX}/lib/gcc-lib/${GNUHOST}/${EGCS_REV}
+.endif
 	if [ ! -f ${PREFIX}/info/dir ]; then \
 	    ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
 	fi
diff --git a/lang/gcc40/Makefile b/lang/gcc40/Makefile
index b834dcef9903..d0534238b138 100644
--- a/lang/gcc40/Makefile
+++ b/lang/gcc40/Makefile
@@ -4,7 +4,7 @@
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.45 1999/02/09 22:17:21 obrien Exp $
+# $Id: Makefile,v 1.46 1999/02/28 10:50:50 obrien Exp $
 #
 
 DISTNAME=	egcs-1.1.2-pre2
@@ -41,6 +41,9 @@ GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 CONFIGURE_ARGS=	--with-gnu-as --with-gnu-ld ${GNUHOST} \
 		--with-gxx-include-dir=${PREFIX}/lib/gcc-lib/${GNUHOST}/${EGCS_REV}/include/g++
+.if defined(WANT_SHAREDLIBS)
+CONFIGURE_ARGS+= --enable-shared
+.endif
 ALL_TARGET=	bootstrap
 MAN1=		cccp.1 g++.1 g77.1 gcc.1
 
@@ -89,6 +92,10 @@ post-install:
 		${PREFIX}/lib/gcc-lib/${GNUHOST}/${EGCS_REV}
 	${MV} -f ${PREFIX}/lib/libstdc++.a  \
 		${PREFIX}/lib/gcc-lib/${GNUHOST}/${EGCS_REV}/libstdc++.a
+.if defined(WANT_SHAREDLIBS)
+	${MV} -f ${PREFIX}/lib/libstdc++.so*  \
+		${PREFIX}/lib/gcc-lib/${GNUHOST}/${EGCS_REV}
+.endif
 	if [ ! -f ${PREFIX}/info/dir ]; then \
 	    ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
 	fi
diff --git a/lang/gcc41/Makefile b/lang/gcc41/Makefile
index b834dcef9903..d0534238b138 100644
--- a/lang/gcc41/Makefile
+++ b/lang/gcc41/Makefile
@@ -4,7 +4,7 @@
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.45 1999/02/09 22:17:21 obrien Exp $
+# $Id: Makefile,v 1.46 1999/02/28 10:50:50 obrien Exp $
 #
 
 DISTNAME=	egcs-1.1.2-pre2
@@ -41,6 +41,9 @@ GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 CONFIGURE_ARGS=	--with-gnu-as --with-gnu-ld ${GNUHOST} \
 		--with-gxx-include-dir=${PREFIX}/lib/gcc-lib/${GNUHOST}/${EGCS_REV}/include/g++
+.if defined(WANT_SHAREDLIBS)
+CONFIGURE_ARGS+= --enable-shared
+.endif
 ALL_TARGET=	bootstrap
 MAN1=		cccp.1 g++.1 g77.1 gcc.1
 
@@ -89,6 +92,10 @@ post-install:
 		${PREFIX}/lib/gcc-lib/${GNUHOST}/${EGCS_REV}
 	${MV} -f ${PREFIX}/lib/libstdc++.a  \
 		${PREFIX}/lib/gcc-lib/${GNUHOST}/${EGCS_REV}/libstdc++.a
+.if defined(WANT_SHAREDLIBS)
+	${MV} -f ${PREFIX}/lib/libstdc++.so*  \
+		${PREFIX}/lib/gcc-lib/${GNUHOST}/${EGCS_REV}
+.endif
 	if [ ! -f ${PREFIX}/info/dir ]; then \
 	    ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
 	fi
diff --git a/lang/gcc42/Makefile b/lang/gcc42/Makefile
index b834dcef9903..d0534238b138 100644
--- a/lang/gcc42/Makefile
+++ b/lang/gcc42/Makefile
@@ -4,7 +4,7 @@
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.45 1999/02/09 22:17:21 obrien Exp $
+# $Id: Makefile,v 1.46 1999/02/28 10:50:50 obrien Exp $
 #
 
 DISTNAME=	egcs-1.1.2-pre2
@@ -41,6 +41,9 @@ GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 CONFIGURE_ARGS=	--with-gnu-as --with-gnu-ld ${GNUHOST} \
 		--with-gxx-include-dir=${PREFIX}/lib/gcc-lib/${GNUHOST}/${EGCS_REV}/include/g++
+.if defined(WANT_SHAREDLIBS)
+CONFIGURE_ARGS+= --enable-shared
+.endif
 ALL_TARGET=	bootstrap
 MAN1=		cccp.1 g++.1 g77.1 gcc.1
 
@@ -89,6 +92,10 @@ post-install:
 		${PREFIX}/lib/gcc-lib/${GNUHOST}/${EGCS_REV}
 	${MV} -f ${PREFIX}/lib/libstdc++.a  \
 		${PREFIX}/lib/gcc-lib/${GNUHOST}/${EGCS_REV}/libstdc++.a
+.if defined(WANT_SHAREDLIBS)
+	${MV} -f ${PREFIX}/lib/libstdc++.so*  \
+		${PREFIX}/lib/gcc-lib/${GNUHOST}/${EGCS_REV}
+.endif
 	if [ ! -f ${PREFIX}/info/dir ]; then \
 	    ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
 	fi
diff --git a/lang/gcc43/Makefile b/lang/gcc43/Makefile
index b834dcef9903..d0534238b138 100644
--- a/lang/gcc43/Makefile
+++ b/lang/gcc43/Makefile
@@ -4,7 +4,7 @@
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.45 1999/02/09 22:17:21 obrien Exp $
+# $Id: Makefile,v 1.46 1999/02/28 10:50:50 obrien Exp $
 #
 
 DISTNAME=	egcs-1.1.2-pre2
@@ -41,6 +41,9 @@ GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 CONFIGURE_ARGS=	--with-gnu-as --with-gnu-ld ${GNUHOST} \
 		--with-gxx-include-dir=${PREFIX}/lib/gcc-lib/${GNUHOST}/${EGCS_REV}/include/g++
+.if defined(WANT_SHAREDLIBS)
+CONFIGURE_ARGS+= --enable-shared
+.endif
 ALL_TARGET=	bootstrap
 MAN1=		cccp.1 g++.1 g77.1 gcc.1
 
@@ -89,6 +92,10 @@ post-install:
 		${PREFIX}/lib/gcc-lib/${GNUHOST}/${EGCS_REV}
 	${MV} -f ${PREFIX}/lib/libstdc++.a  \
 		${PREFIX}/lib/gcc-lib/${GNUHOST}/${EGCS_REV}/libstdc++.a
+.if defined(WANT_SHAREDLIBS)
+	${MV} -f ${PREFIX}/lib/libstdc++.so*  \
+		${PREFIX}/lib/gcc-lib/${GNUHOST}/${EGCS_REV}
+.endif
 	if [ ! -f ${PREFIX}/info/dir ]; then \
 	    ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
 	fi
diff --git a/lang/gcc44/Makefile b/lang/gcc44/Makefile
index b834dcef9903..d0534238b138 100644
--- a/lang/gcc44/Makefile
+++ b/lang/gcc44/Makefile
@@ -4,7 +4,7 @@
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.45 1999/02/09 22:17:21 obrien Exp $
+# $Id: Makefile,v 1.46 1999/02/28 10:50:50 obrien Exp $
 #
 
 DISTNAME=	egcs-1.1.2-pre2
@@ -41,6 +41,9 @@ GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 CONFIGURE_ARGS=	--with-gnu-as --with-gnu-ld ${GNUHOST} \
 		--with-gxx-include-dir=${PREFIX}/lib/gcc-lib/${GNUHOST}/${EGCS_REV}/include/g++
+.if defined(WANT_SHAREDLIBS)
+CONFIGURE_ARGS+= --enable-shared
+.endif
 ALL_TARGET=	bootstrap
 MAN1=		cccp.1 g++.1 g77.1 gcc.1
 
@@ -89,6 +92,10 @@ post-install:
 		${PREFIX}/lib/gcc-lib/${GNUHOST}/${EGCS_REV}
 	${MV} -f ${PREFIX}/lib/libstdc++.a  \
 		${PREFIX}/lib/gcc-lib/${GNUHOST}/${EGCS_REV}/libstdc++.a
+.if defined(WANT_SHAREDLIBS)
+	${MV} -f ${PREFIX}/lib/libstdc++.so*  \
+		${PREFIX}/lib/gcc-lib/${GNUHOST}/${EGCS_REV}
+.endif
 	if [ ! -f ${PREFIX}/info/dir ]; then \
 	    ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
 	fi
diff --git a/lang/gcc45/Makefile b/lang/gcc45/Makefile
index b834dcef9903..d0534238b138 100644
--- a/lang/gcc45/Makefile
+++ b/lang/gcc45/Makefile
@@ -4,7 +4,7 @@
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.45 1999/02/09 22:17:21 obrien Exp $
+# $Id: Makefile,v 1.46 1999/02/28 10:50:50 obrien Exp $
 #
 
 DISTNAME=	egcs-1.1.2-pre2
@@ -41,6 +41,9 @@ GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 CONFIGURE_ARGS=	--with-gnu-as --with-gnu-ld ${GNUHOST} \
 		--with-gxx-include-dir=${PREFIX}/lib/gcc-lib/${GNUHOST}/${EGCS_REV}/include/g++
+.if defined(WANT_SHAREDLIBS)
+CONFIGURE_ARGS+= --enable-shared
+.endif
 ALL_TARGET=	bootstrap
 MAN1=		cccp.1 g++.1 g77.1 gcc.1
 
@@ -89,6 +92,10 @@ post-install:
 		${PREFIX}/lib/gcc-lib/${GNUHOST}/${EGCS_REV}
 	${MV} -f ${PREFIX}/lib/libstdc++.a  \
 		${PREFIX}/lib/gcc-lib/${GNUHOST}/${EGCS_REV}/libstdc++.a
+.if defined(WANT_SHAREDLIBS)
+	${MV} -f ${PREFIX}/lib/libstdc++.so*  \
+		${PREFIX}/lib/gcc-lib/${GNUHOST}/${EGCS_REV}
+.endif
 	if [ ! -f ${PREFIX}/info/dir ]; then \
 	    ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
 	fi
diff --git a/lang/gcc46/Makefile b/lang/gcc46/Makefile
index b834dcef9903..d0534238b138 100644
--- a/lang/gcc46/Makefile
+++ b/lang/gcc46/Makefile
@@ -4,7 +4,7 @@
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.45 1999/02/09 22:17:21 obrien Exp $
+# $Id: Makefile,v 1.46 1999/02/28 10:50:50 obrien Exp $
 #
 
 DISTNAME=	egcs-1.1.2-pre2
@@ -41,6 +41,9 @@ GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 CONFIGURE_ARGS=	--with-gnu-as --with-gnu-ld ${GNUHOST} \
 		--with-gxx-include-dir=${PREFIX}/lib/gcc-lib/${GNUHOST}/${EGCS_REV}/include/g++
+.if defined(WANT_SHAREDLIBS)
+CONFIGURE_ARGS+= --enable-shared
+.endif
 ALL_TARGET=	bootstrap
 MAN1=		cccp.1 g++.1 g77.1 gcc.1
 
@@ -89,6 +92,10 @@ post-install:
 		${PREFIX}/lib/gcc-lib/${GNUHOST}/${EGCS_REV}
 	${MV} -f ${PREFIX}/lib/libstdc++.a  \
 		${PREFIX}/lib/gcc-lib/${GNUHOST}/${EGCS_REV}/libstdc++.a
+.if defined(WANT_SHAREDLIBS)
+	${MV} -f ${PREFIX}/lib/libstdc++.so*  \
+		${PREFIX}/lib/gcc-lib/${GNUHOST}/${EGCS_REV}
+.endif
 	if [ ! -f ${PREFIX}/info/dir ]; then \
 	    ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
 	fi
diff --git a/lang/gcc47/Makefile b/lang/gcc47/Makefile
index b834dcef9903..d0534238b138 100644
--- a/lang/gcc47/Makefile
+++ b/lang/gcc47/Makefile
@@ -4,7 +4,7 @@
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.45 1999/02/09 22:17:21 obrien Exp $
+# $Id: Makefile,v 1.46 1999/02/28 10:50:50 obrien Exp $
 #
 
 DISTNAME=	egcs-1.1.2-pre2
@@ -41,6 +41,9 @@ GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 CONFIGURE_ARGS=	--with-gnu-as --with-gnu-ld ${GNUHOST} \
 		--with-gxx-include-dir=${PREFIX}/lib/gcc-lib/${GNUHOST}/${EGCS_REV}/include/g++
+.if defined(WANT_SHAREDLIBS)
+CONFIGURE_ARGS+= --enable-shared
+.endif
 ALL_TARGET=	bootstrap
 MAN1=		cccp.1 g++.1 g77.1 gcc.1
 
@@ -89,6 +92,10 @@ post-install:
 		${PREFIX}/lib/gcc-lib/${GNUHOST}/${EGCS_REV}
 	${MV} -f ${PREFIX}/lib/libstdc++.a  \
 		${PREFIX}/lib/gcc-lib/${GNUHOST}/${EGCS_REV}/libstdc++.a
+.if defined(WANT_SHAREDLIBS)
+	${MV} -f ${PREFIX}/lib/libstdc++.so*  \
+		${PREFIX}/lib/gcc-lib/${GNUHOST}/${EGCS_REV}
+.endif
 	if [ ! -f ${PREFIX}/info/dir ]; then \
 	    ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
 	fi
diff --git a/lang/gcc48/Makefile b/lang/gcc48/Makefile
index b834dcef9903..d0534238b138 100644
--- a/lang/gcc48/Makefile
+++ b/lang/gcc48/Makefile
@@ -4,7 +4,7 @@
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.45 1999/02/09 22:17:21 obrien Exp $
+# $Id: Makefile,v 1.46 1999/02/28 10:50:50 obrien Exp $
 #
 
 DISTNAME=	egcs-1.1.2-pre2
@@ -41,6 +41,9 @@ GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 CONFIGURE_ARGS=	--with-gnu-as --with-gnu-ld ${GNUHOST} \
 		--with-gxx-include-dir=${PREFIX}/lib/gcc-lib/${GNUHOST}/${EGCS_REV}/include/g++
+.if defined(WANT_SHAREDLIBS)
+CONFIGURE_ARGS+= --enable-shared
+.endif
 ALL_TARGET=	bootstrap
 MAN1=		cccp.1 g++.1 g77.1 gcc.1
 
@@ -89,6 +92,10 @@ post-install:
 		${PREFIX}/lib/gcc-lib/${GNUHOST}/${EGCS_REV}
 	${MV} -f ${PREFIX}/lib/libstdc++.a  \
 		${PREFIX}/lib/gcc-lib/${GNUHOST}/${EGCS_REV}/libstdc++.a
+.if defined(WANT_SHAREDLIBS)
+	${MV} -f ${PREFIX}/lib/libstdc++.so*  \
+		${PREFIX}/lib/gcc-lib/${GNUHOST}/${EGCS_REV}
+.endif
 	if [ ! -f ${PREFIX}/info/dir ]; then \
 	    ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
 	fi