Bug#928785: gcc-9: cross-install-location.diff no longer applies

[Helmut Grohne <helmut@subdivi.de>]

Source: gcc-9
Version: 9.1.0-1
Tags: patch
User: helmutg@debian.org
Usertags: rebootstrap

Hi Matthias,

I noticed that cross-install-location.diff no longer applies. The
attached patch fixes that. Please let me know if you'd prefer a pull
request on salsa.

Helmut

--- a/debian/patches/cross-install-location.diff
+++ b/debian/patches/cross-install-location.diff
@@ -18,8 +18,8 @@
  @LIBGFOR_USE_SYMVER_GNU_TRUE@@LIBGFOR_USE_SYMVER_TRUE@version_dep = $(srcdir)/gfortran.map
  @LIBGFOR_USE_SYMVER_SUN_TRUE@@LIBGFOR_USE_SYMVER_TRUE@version_dep = gfortran.map-sun
  gfor_c_HEADERS = $(srcdir)/ISO_Fortran_binding.h
--gfor_cdir = $(libdir)/gcc/$(target_alias)/$(gcc_version)$(MULTISUBDIR)/include
-+gfor_cdir = $(libdir)/gcc-cross/$(target_alias)/$(gcc_version)$(MULTISUBDIR)/include
+-gfor_cdir = $(libdir)/gcc/$(target_alias)/$(gcc_version)/include
++gfor_cdir = $(libdir)/gcc-cross/$(target_alias)/$(gcc_version)/include
  LTLDFLAGS = $(shell $(SHELL) $(top_srcdir)/../libtool-ldflags $(LDFLAGS)) \
  	    $(lt_host_flags)
  
@@ -44,8 +44,8 @@
  endif
  
  gfor_c_HEADERS = $(srcdir)/ISO_Fortran_binding.h
--gfor_cdir = $(libdir)/gcc/$(target_alias)/$(gcc_version)$(MULTISUBDIR)/include
-+gfor_cdir = $(libdir)/gcc-cross/$(target_alias)/$(gcc_version)$(MULTISUBDIR)/include
+-gfor_cdir = $(libdir)/gcc/$(target_alias)/$(gcc_version)/include
++gfor_cdir = $(libdir)/gcc-cross/$(target_alias)/$(gcc_version)/include
  
  LTLDFLAGS = $(shell $(SHELL) $(top_srcdir)/../libtool-ldflags $(LDFLAGS)) \
  	    $(lt_host_flags)