From e61d43791e0943414d33c96de1dd4bfe5f611e29 Mon Sep 17 00:00:00 2001 From: Richard Biener Date: Fri, 20 Jan 2023 12:27:50 +0100 Subject: modula2/108144 - Fix multilib install of libgm2 The following adjusts libgm2 to properly use the multilib build infrastructure, thereby fixing the install with --enable-version-specific-runtime-libs In particular config-ml.pl needs to be applied to generated Makefiles as documented in the manual and we have to avoid clobbering the variables via make arguments. The explicit install rules used different ways to construct the multilib dir which isn't necessary and breaks when MUTLIDIR is now finally set correctly. Instead use $(toolexeclibdir). This results in some dead variables in the Makefile.am (and there were some before), I refrained from doing even more changes here. Verified with an install with and without --enable-version-specific-runtime-libs and checking the result. PR modula2/108144 libgm2/ * configure.ac: Apply config-ml.pl to the generated Makefiles. Set multilib_arg, use AM_PROG_LIBTOOL. * configure: Regenerate. * Makefile.am (AM_MAKEFLAGS): Do not override MULTI* flags. * Makefile.in: Regenerate. * libm2cor/Makefile.am: Install to $(toolexeclibdir)$(M2LIBDIR) rather than $(inst_libdir)/$(MULTIDIR)$(M2LIBDIR). * libm2iso/Makefile.am: Likewise. * libm2log/Makefile.am: Likewise. * libm2min/Makefile.am: Likewise. * libm2pim/Makefile.am: Likewise. * libm2cor/Makefile.in: Regenerate. * libm2iso/Makefile.in: Likewise. * libm2log/Makefile.in: Likewise. * libm2min/Makefile.in: Likewise. * libm2pim/Makefile.in: Likewise. --- libgm2/libm2iso/Makefile.am | 22 +++++++++++----------- libgm2/libm2iso/Makefile.in | 22 +++++++++++----------- 2 files changed, 22 insertions(+), 22 deletions(-) (limited to 'libgm2/libm2iso') diff --git a/libgm2/libm2iso/Makefile.am b/libgm2/libm2iso/Makefile.am index 90917bb..b4eb58a 100644 --- a/libgm2/libm2iso/Makefile.am +++ b/libgm2/libm2iso/Makefile.am @@ -219,29 +219,29 @@ SYSTEM.def: Makefile $(LIBTOOL) --tag=CXX --mode=compile $(CXX) -c -I$(srcdir) $(CXXFLAGS) $(LIBCFLAGS) $(libm2iso_la_CFLAGS) $< -o $@ install-data-local: force - mkdir -p $(DESTDIR)$(inst_libdir)/$(MULTIDIR)$(M2LIBDIR) - $(INSTALL_DATA) .libs/libm2iso.la $(DESTDIR)$(inst_libdir)/$(MULTIDIR)$(M2LIBDIR) - chmod 644 $(DESTDIR)$(inst_libdir)/$(MULTIDIR)$(M2LIBDIR)libm2iso.la - $(INSTALL_DATA) .libs/libm2iso.a $(DESTDIR)$(inst_libdir)/$(MULTIDIR)$(M2LIBDIR) - chmod 644 $(DESTDIR)$(inst_libdir)/$(MULTIDIR)$(M2LIBDIR)/libm2iso.a - $(RANLIB) $(DESTDIR)$(inst_libdir)/$(MULTIDIR)$(M2LIBDIR)/libm2iso.a + mkdir -p $(DESTDIR)$(toolexeclibdir)$(M2LIBDIR) + $(INSTALL_DATA) .libs/libm2iso.la $(DESTDIR)$(toolexeclibdir)$(M2LIBDIR) + chmod 644 $(DESTDIR)$(toolexeclibdir)$(M2LIBDIR)libm2iso.la + $(INSTALL_DATA) .libs/libm2iso.a $(DESTDIR)$(toolexeclibdir)$(M2LIBDIR) + chmod 644 $(DESTDIR)$(toolexeclibdir)$(M2LIBDIR)/libm2iso.a + $(RANLIB) $(DESTDIR)$(toolexeclibdir)$(M2LIBDIR)/libm2iso.a for i in $(M2DEFS) $(M2MODS) ; do \ if [ -f $$i ] ; then \ - $(INSTALL_DATA) $$i '$(DESTDIR)$(inst_libdir)/$(MULTIDIR)$(M2LIBDIR)'; \ + $(INSTALL_DATA) $$i '$(DESTDIR)$(toolexeclibdir)$(M2LIBDIR)'; \ elif [ -f @srcdir@/../../gcc/m2/gm2-libs-iso/$$i ] ; then \ - $(INSTALL_DATA) @srcdir@/../../gcc/m2/gm2-libs-iso/$$i '$(DESTDIR)$(inst_libdir)/$(MULTIDIR)$(M2LIBDIR)'; \ + $(INSTALL_DATA) @srcdir@/../../gcc/m2/gm2-libs-iso/$$i '$(DESTDIR)$(toolexeclibdir)$(M2LIBDIR)'; \ else \ echo "cannot find $$i" ; exit 1 ; \ fi ; \ - chmod 644 $(DESTDIR)$(inst_libdir)/$(MULTIDIR)$(M2LIBDIR)$$i ; \ + chmod 644 $(DESTDIR)$(toolexeclibdir)$(M2LIBDIR)$$i ; \ done for i in $(M2HEADER_FILES) ; do \ if [ -f @srcdir@/$$i ] ; then \ - $(INSTALL_DATA) @srcdir@/$$i '$(DESTDIR)$(inst_libdir)/$(MULTIDIR)$(M2LIBDIR)'; \ + $(INSTALL_DATA) @srcdir@/$$i '$(DESTDIR)$(toolexeclibdir)$(M2LIBDIR)'; \ else \ echo "cannot find $$i" ; exit 1 ; \ fi ; \ - chmod 644 $(DESTDIR)$(inst_libdir)/$(MULTIDIR)$(M2LIBDIR)$$i ; \ + chmod 644 $(DESTDIR)$(toolexeclibdir)$(M2LIBDIR)$$i ; \ done force: diff --git a/libgm2/libm2iso/Makefile.in b/libgm2/libm2iso/Makefile.in index fe77b9d..b8984c6 100644 --- a/libgm2/libm2iso/Makefile.in +++ b/libgm2/libm2iso/Makefile.in @@ -918,29 +918,29 @@ uninstall-am: uninstall-toolexeclibLTLIBRARIES @BUILD_ISOLIB_TRUE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) -c -I$(srcdir) $(CXXFLAGS) $(LIBCFLAGS) $(libm2iso_la_CFLAGS) $< -o $@ @BUILD_ISOLIB_TRUE@install-data-local: force -@BUILD_ISOLIB_TRUE@ mkdir -p $(DESTDIR)$(inst_libdir)/$(MULTIDIR)$(M2LIBDIR) -@BUILD_ISOLIB_TRUE@ $(INSTALL_DATA) .libs/libm2iso.la $(DESTDIR)$(inst_libdir)/$(MULTIDIR)$(M2LIBDIR) -@BUILD_ISOLIB_TRUE@ chmod 644 $(DESTDIR)$(inst_libdir)/$(MULTIDIR)$(M2LIBDIR)libm2iso.la -@BUILD_ISOLIB_TRUE@ $(INSTALL_DATA) .libs/libm2iso.a $(DESTDIR)$(inst_libdir)/$(MULTIDIR)$(M2LIBDIR) -@BUILD_ISOLIB_TRUE@ chmod 644 $(DESTDIR)$(inst_libdir)/$(MULTIDIR)$(M2LIBDIR)/libm2iso.a -@BUILD_ISOLIB_TRUE@ $(RANLIB) $(DESTDIR)$(inst_libdir)/$(MULTIDIR)$(M2LIBDIR)/libm2iso.a +@BUILD_ISOLIB_TRUE@ mkdir -p $(DESTDIR)$(toolexeclibdir)$(M2LIBDIR) +@BUILD_ISOLIB_TRUE@ $(INSTALL_DATA) .libs/libm2iso.la $(DESTDIR)$(toolexeclibdir)$(M2LIBDIR) +@BUILD_ISOLIB_TRUE@ chmod 644 $(DESTDIR)$(toolexeclibdir)$(M2LIBDIR)libm2iso.la +@BUILD_ISOLIB_TRUE@ $(INSTALL_DATA) .libs/libm2iso.a $(DESTDIR)$(toolexeclibdir)$(M2LIBDIR) +@BUILD_ISOLIB_TRUE@ chmod 644 $(DESTDIR)$(toolexeclibdir)$(M2LIBDIR)/libm2iso.a +@BUILD_ISOLIB_TRUE@ $(RANLIB) $(DESTDIR)$(toolexeclibdir)$(M2LIBDIR)/libm2iso.a @BUILD_ISOLIB_TRUE@ for i in $(M2DEFS) $(M2MODS) ; do \ @BUILD_ISOLIB_TRUE@ if [ -f $$i ] ; then \ -@BUILD_ISOLIB_TRUE@ $(INSTALL_DATA) $$i '$(DESTDIR)$(inst_libdir)/$(MULTIDIR)$(M2LIBDIR)'; \ +@BUILD_ISOLIB_TRUE@ $(INSTALL_DATA) $$i '$(DESTDIR)$(toolexeclibdir)$(M2LIBDIR)'; \ @BUILD_ISOLIB_TRUE@ elif [ -f @srcdir@/../../gcc/m2/gm2-libs-iso/$$i ] ; then \ -@BUILD_ISOLIB_TRUE@ $(INSTALL_DATA) @srcdir@/../../gcc/m2/gm2-libs-iso/$$i '$(DESTDIR)$(inst_libdir)/$(MULTIDIR)$(M2LIBDIR)'; \ +@BUILD_ISOLIB_TRUE@ $(INSTALL_DATA) @srcdir@/../../gcc/m2/gm2-libs-iso/$$i '$(DESTDIR)$(toolexeclibdir)$(M2LIBDIR)'; \ @BUILD_ISOLIB_TRUE@ else \ @BUILD_ISOLIB_TRUE@ echo "cannot find $$i" ; exit 1 ; \ @BUILD_ISOLIB_TRUE@ fi ; \ -@BUILD_ISOLIB_TRUE@ chmod 644 $(DESTDIR)$(inst_libdir)/$(MULTIDIR)$(M2LIBDIR)$$i ; \ +@BUILD_ISOLIB_TRUE@ chmod 644 $(DESTDIR)$(toolexeclibdir)$(M2LIBDIR)$$i ; \ @BUILD_ISOLIB_TRUE@ done @BUILD_ISOLIB_TRUE@ for i in $(M2HEADER_FILES) ; do \ @BUILD_ISOLIB_TRUE@ if [ -f @srcdir@/$$i ] ; then \ -@BUILD_ISOLIB_TRUE@ $(INSTALL_DATA) @srcdir@/$$i '$(DESTDIR)$(inst_libdir)/$(MULTIDIR)$(M2LIBDIR)'; \ +@BUILD_ISOLIB_TRUE@ $(INSTALL_DATA) @srcdir@/$$i '$(DESTDIR)$(toolexeclibdir)$(M2LIBDIR)'; \ @BUILD_ISOLIB_TRUE@ else \ @BUILD_ISOLIB_TRUE@ echo "cannot find $$i" ; exit 1 ; \ @BUILD_ISOLIB_TRUE@ fi ; \ -@BUILD_ISOLIB_TRUE@ chmod 644 $(DESTDIR)$(inst_libdir)/$(MULTIDIR)$(M2LIBDIR)$$i ; \ +@BUILD_ISOLIB_TRUE@ chmod 644 $(DESTDIR)$(toolexeclibdir)$(M2LIBDIR)$$i ; \ @BUILD_ISOLIB_TRUE@ done @BUILD_ISOLIB_TRUE@force: -- cgit v1.1