More %_target_platform tweaks: cleanup build_os filter; initialize %_gnueabi; replace %_gnu with %_gnueabi in %_target_platform

configure.in

@@ -860,20 +860,24 @@ elif echo "$build_os" | grep sunos > /dev/null; then
 	AC_LIBOBJ(myrealloc)
 fi
 
-RPMCANONGNU="-gnu"
+RPMCANONGNU='-gnu'
+RPMCANONGNUEABI='%nil'
 #
 # get rid of the 4-th tuple, if config.guess returned "linux-gnu" for build_os
 #
-if echo "$build_os" | grep '.*-gnulibc1' > /dev/null ; then
-	build_os=`echo "${build_os}" | sed 's/-gnulibc1$//'`
-fi
-if echo "$build_os" | grep '.*-gnu' > /dev/null ; then
-	build_os=`echo "${build_os}" | sed 's/-gnu$//'`
-fi
-if echo "$build_os" | grep '.*-gnueabi' > /dev/null ; then
-	build_os=`echo "${build_os}" | sed 's/-gnueabi$//'`
-	RPMCANONGNU="-gnueabi"
-fi
+case "$build_os" in
+	*-gnulibc1)
+		build_os="${build_os%-gnulibc1}"
+		;;
+	*-gnu)
+		build_os="${build_os%-gnu}"
+		;;
+	*-gnueabi)
+		build_os="${build_os%-gnueabi}"
+		RPMCANONGNU='-gnueabi'
+		RPMCANONGNUEABI='-gnueabi'
+		;;
+esac
 
 changequote(<, >)
 build_os_exact="${build_os}"
@@ -917,6 +921,7 @@ AC_SUBST(RPMCANONARCH)
 AC_SUBST(RPMCANONVENDOR)
 AC_SUBST(RPMCANONOS)
 AC_SUBST(RPMCANONGNU)
+AC_SUBST(RPMCANONGNUEABI)
 
 if test X"$prefix" = XNONE ; then
     usrprefix="$ac_default_prefix"

platform.in

@@ -7,7 +7,8 @@
 %_vendor		@RPMCANONVENDOR@
 %_os			@RPMCANONOS@
 %_gnu			@RPMCANONGNU@
-%_target_platform	%{_target_cpu}-%{_vendor}-%{_target_os}%{_gnu}
+%_gnueabi		@RPMCANONGNUEABI@
+%_target_platform	%{_target_cpu}-%{_vendor}-%{_target_os}%{_gnueabi}
 %optflags		@RPMRC_OPTFLAGS@
 
 #==============================================================================