--- /usr/portage/sys-devel/gcc-config/files/gcc-config-1.3.4	2003-11-18 14:39:07.000000000 -0500
+++ gcc-config-1.3.4	2004-04-20 12:40:35.000000000 -0500
@@ -284,17 +284,33 @@
 
 	source "/etc/env.d/gcc/${CC_COMP}"
 
-	echo "export PATH=\"${PATH}:${OLDPATH}\""
-
-#	if [ -z "${LD_LIBRARY_PATH}" ]
-#	then
-#		echo "export LD_LIBRARY_PATH=\"${LDPATH}\""
-#	else
-#		echo "export LD_LIBRARY_PATH=\"${LDPATH}:${LD_LIBRARY_PATH}\""
-#	fi
-
-	echo "export CC=\"${CC}\""
-	echo "export CXX=\"${CXX}\""
+	case $SHELL in
+	*/csh|*/tcsh)
+		echo "setenv PATH \"${PATH}:${OLDPATH}\";"
+
+#		if [ -z "${LD_LIBRARY_PATH}" ]
+#		then
+#			echo "setenv LD_LIBRARY_PATH \"${LDPATH}\";"
+#		else
+#			echo "setenv LD_LIBRARY_PATH \"${LDPATH}:${LD_LIBRARY_PATH}\";"
+#		fi
+		echo "setenv CC \"${CC}\";"
+		echo "setenv CXX \"${CXX}\";"
+		;;
+	*)
+		echo "export PATH=\"${PATH}:${OLDPATH}\""
+
+#		if [ -z "${LD_LIBRARY_PATH}" ]
+#		then
+#			echo "export LD_LIBRARY_PATH=\"${LDPATH}\""
+#		else
+#			echo "export LD_LIBRARY_PATH=\"${LDPATH}:${LD_LIBRARY_PATH}\""
+#		fi
+
+		echo "export CC=\"${CC}\""
+		echo "export CXX=\"${CXX}\""
+		;;
+	esac
 }
 
 get_bin_path() {
--- /usr/portage/sys-devel/gcc-config/files/gcc-config-1.3.4-multi-ldpath	2003-11-18 14:39:07.000000000 -0500
+++ gcc-config-1.3.4-multi-ldpath	2004-04-20 12:52:27.000000000 -0500
@@ -284,17 +284,33 @@
 
 	source "/etc/env.d/gcc/${CC_COMP}"
 
-	echo "export PATH=\"${PATH}:${OLDPATH}\""
-
-#	if [ -z "${LD_LIBRARY_PATH}" ]
-#	then
-#		echo "export LD_LIBRARY_PATH=\"${LDPATH}\""
-#	else
-#		echo "export LD_LIBRARY_PATH=\"${LDPATH}:${LD_LIBRARY_PATH}\""
-#	fi
-
-	echo "export CC=\"${CC}\""
-	echo "export CXX=\"${CXX}\""
+	case $SHELL in
+	*/csh|*/tcsh)
+		echo "setenv PATH \"${PATH}:${OLDPATH}\";"
+
+#		if [ -z "${LD_LIBRARY_PATH}" ]
+#		then
+#			echo "setenv LD_LIBRARY_PATH \"${LDPATH}\";"
+#		else
+#			echo "setenv LD_LIBRARY_PATH \"${LDPATH}:${LD_LIBRARY_PATH}\";"
+#		fi
+		echo "setenv CC \"${CC}\";"
+		echo "setenv CXX \"${CXX}\";"
+		;;
+	*)
+		echo "export PATH=\"${PATH}:${OLDPATH}\""
+
+#		if [ -z "${LD_LIBRARY_PATH}" ]
+#		then
+#			echo "export LD_LIBRARY_PATH=\"${LDPATH}\""
+#		else
+#			echo "export LD_LIBRARY_PATH=\"${LDPATH}:${LD_LIBRARY_PATH}\""
+#		fi
+
+		echo "export CC=\"${CC}\""
+		echo "export CXX=\"${CXX}\""
+		;;
+	esac
 }
 
 get_bin_path() {