diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog index 80a37fb28ebfcae1e1dcd5f94b3d4d879355f257..72b70a0c559411bf53bde462d2cbc00757f83f8c 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 90fdef41097b593c7c3d1ab1c30d81c19b0bf84a..ef9c23d54df0a526788cb9e04d78ac07ac836743 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 ef0f13271e3e502713d8f63d633cbf733eca514c..eb519a39f32d600f69dcd3f223cfe7379acf85ad 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)