From 7a0c8ca8872a73c6886940448ba9b3203b13268d Mon Sep 17 00:00:00 2001 From: John Ericson Date: Mon, 21 Jul 2025 11:42:13 -0400 Subject: [PATCH] libgfortran: Force regular include/lib dir --- libgfortran/Makefile.am | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/libgfortran/Makefile.am b/libgfortran/Makefile.am index 21b35c76a06..3d38cde5b42 100644 --- a/libgfortran/Makefile.am +++ b/libgfortran/Makefile.am @@ -42,14 +42,13 @@ extra_darwin_ldflags_libgfortran += -Wc,-nodefaultrpaths extra_darwin_ldflags_libgfortran += -Wl,-rpath,@loader_path endif -gfor_c_HEADERS = ISO_Fortran_binding.h -gfor_cdir = $(libdir)/gcc/$(target_alias)/$(gcc_version)/include +include_HEADERS = ISO_Fortran_binding.h LTLDFLAGS = $(shell $(SHELL) $(top_srcdir)/../libtool-ldflags $(LDFLAGS)) \ $(lt_host_flags) -toolexeclib_LTLIBRARIES = libgfortran.la -toolexeclib_DATA = libgfortran.spec +lib_LTLIBRARIES = libgfortran.la +toolexeclib_DATA = libgfortran.spec # needs "exec" in name libgfortran_la_LINK = $(LINK) $(libgfortran_la_LDFLAGS) libgfortran_la_LDFLAGS = -version-info `grep -v '^\#' $(srcdir)/libtool-version` \ $(LTLDFLAGS) $(LIBQUADLIB) ../libbacktrace/libbacktrace.la \ @@ -58,16 +57,14 @@ libgfortran_la_LDFLAGS = -version-info `grep -v '^\#' $(srcdir)/libtool-version` $(version_arg) -Wc,-shared-libgcc libgfortran_la_DEPENDENCIES = $(version_dep) libgfortran.spec $(LIBQUADLIB_DEP) -cafexeclib_LTLIBRARIES = libcaf_single.la -cafexeclibdir = $(libdir)/gcc/$(target_alias)/$(gcc_version)$(MULTISUBDIR) +lib_LTLIBRARIES += libcaf_single.la libcaf_single_la_SOURCES = caf/single.c libcaf_single_la_LDFLAGS = -static libcaf_single_la_DEPENDENCIES = caf/libcaf.h libcaf_single_la_LINK = $(LINK) $(libcaf_single_la_LDFLAGS) if IEEE_SUPPORT -fincludedir = $(libdir)/gcc/$(target_alias)/$(gcc_version)$(MULTISUBDIR)/finclude -nodist_finclude_HEADERS = ieee_arithmetic.mod ieee_exceptions.mod ieee_features.mod +nodist_include_HEADERS = ieee_arithmetic.mod ieee_exceptions.mod ieee_features.mod endif ## io.h conflicts with a system header on some platforms, so -- 2.47.2