aboutsummaryrefslogtreecommitdiff
path: root/libgfortran
diff options
context:
space:
mode:
authorJakub Jelinek <jakub@redhat.com>2019-05-02 13:02:27 +0000
committerJakub Jelinek <jakub@redhat.com>2019-05-02 13:02:27 +0000
commitdf3dbb8b3ba710f79c4ceacdb226eb5535e28a9e (patch)
tree8668e95642ea0152d001780e42a8647416e9bb1b /libgfortran
parent1a080bcd1885b37d54a0067bd54e3175074d7a9a (diff)
* Makefile.am (gfor_cdir): Remove $(MULTISUBDIR).
* Makefile.in: Regenerated. git-svn-id: https://gcc.gnu.org/svn/gcc/trunk@270793 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libgfortran')
-rw-r--r--libgfortran/ChangeLog5
-rw-r--r--libgfortran/Makefile.am2
-rw-r--r--libgfortran/Makefile.in2
3 files changed, 7 insertions, 2 deletions
diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog
index 80a37fb28eb..72b70a0c559 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 90fdef41097..ef9c23d54df 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 ef0f13271e3..eb519a39f32 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)