From: Jakub Jelinek <jakub@redhat.com>
Date: Thu, 2 May 2019 13:02:27 +0000 (+0200)
Subject: Makefile.am (gfor_cdir): Remove $(MULTISUBDIR).
X-Git-Tag: upstream/12.2.0~24933
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5cf393b236dc3ea08e5714545744607f989ab6e0;p=platform%2Fupstream%2Fgcc.git

Makefile.am (gfor_cdir): Remove $(MULTISUBDIR).

	* Makefile.am (gfor_cdir): Remove $(MULTISUBDIR).
	* Makefile.in: Regenerated.

From-SVN: r270793
---

diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog
index 80a37fb..72b70a0 100644
--- a/libgfortran/ChangeLog
+++ b/libgfortran/ChangeLog
@@ -1,3 +1,8 @@
+2019-05-02  Jakub Jelinek  <jakub@redhat.com>
+
+	* Makefile.am (gfor_cdir): Remove $(MULTISUBDIR).
+	* Makefile.in: Regenerated.
+
 2019-04-14  Paul Thomas  <pault@gcc.gnu.org>
 
 	PR fortran/89843
diff --git a/libgfortran/Makefile.am b/libgfortran/Makefile.am
index 90fdef4..ef9c23d 100644
--- a/libgfortran/Makefile.am
+++ b/libgfortran/Makefile.am
@@ -31,7 +31,7 @@ version_dep =
 endif
 
 gfor_c_HEADERS = $(srcdir)/ISO_Fortran_binding.h
-gfor_cdir = $(libdir)/gcc/$(target_alias)/$(gcc_version)$(MULTISUBDIR)/include
+gfor_cdir = $(libdir)/gcc/$(target_alias)/$(gcc_version)/include
 
 LTLDFLAGS = $(shell $(SHELL) $(top_srcdir)/../libtool-ldflags $(LDFLAGS)) \
 	    $(lt_host_flags)
diff --git a/libgfortran/Makefile.in b/libgfortran/Makefile.in
index ef0f132..eb519a3 100644
--- a/libgfortran/Makefile.in
+++ b/libgfortran/Makefile.in
@@ -717,7 +717,7 @@ gcc_version := $(shell @get_gcc_base_ver@ $(top_srcdir)/../gcc/BASE-VER)
 @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/$(target_alias)/$(gcc_version)/include
 LTLDFLAGS = $(shell $(SHELL) $(top_srcdir)/../libtool-ldflags $(LDFLAGS)) \
 	    $(lt_host_flags)