From 5cf393b236dc3ea08e5714545744607f989ab6e0 Mon Sep 17 00:00:00 2001 From: Jakub Jelinek <jakub@redhat.com> Date: Thu, 2 May 2019 15:02:27 +0200 Subject: [PATCH] Makefile.am (gfor_cdir): Remove $(MULTISUBDIR). * Makefile.am (gfor_cdir): Remove $(MULTISUBDIR). * Makefile.in: Regenerated. From-SVN: r270793 --- libgfortran/ChangeLog | 5 +++++ libgfortran/Makefile.am | 2 +- libgfortran/Makefile.in | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog index 80a37fb28ebf..72b70a0c5594 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 90fdef41097b..ef9c23d54df0 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 ef0f13271e3e..eb519a39f32d 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) -- GitLab