Makefile.in (s-mlib): Only pass MULTIARCH_DIRNAME if MULTILIB_OSDIRNAMES is not defined.

2014-03-06  Matthias Klose  <doko@ubuntu.com>

        * Makefile.in (s-mlib): Only pass MULTIARCH_DIRNAME if
        MULTILIB_OSDIRNAMES is not defined.

From-SVN: r208383

gcc/ChangeLog

+2014-03-06  Matthias Klose  <doko@ubuntu.com>
+
+	* Makefile.in (s-mlib): Only pass MULTIARCH_DIRNAME if
+	MULTILIB_OSDIRNAMES is not defined.
+
 2014-03-06  Jakub Jelinek  <jakub@redhat.com>
 	    Meador Inge  <meadori@codesourcery.com>
 

gcc/Makefile.in

@@ -1838,7 +1838,7 @@ s-mlib: $(srcdir)/genmultilib Makefile
 	    "$(MULTILIB_EXCLUSIONS)" \
 	    "$(MULTILIB_OSDIRNAMES)" \
 	    "$(MULTILIB_REQUIRED)" \
-	    "$(MULTIARCH_DIRNAME)" \
+	    "$(if $(MULTILIB_OSDIRNAMES),,$(MULTIARCH_DIRNAME))" \
 	    "$(MULTILIB_REUSE)" \
 	    "@enable_multilib@" \
 	    > tmp-mlib.h; \