From 47465fff9738b08796f4b52570fec49bbdbf3e57 Mon Sep 17 00:00:00 2001 From: Richard Biener Date: Mon, 23 Jan 2023 11:14:05 +0100 Subject: modula2/108144 - fix mistake in previous change The previous change to avoid a duplicate multi directory caused the m2/m2{cor,iso,log,min,pim} installs to happen relative to the main library directory when not using --enable-version-specific-runtime-libs which doesn't match the drivers expectation where to find them. The following fixes the original issue by simply dropping the duplicate multi directory since the one in the $(inst_libdir) variable now works. Tested by building and installing with and without --enable-version-specific-runtime-libs and compiling and linking a modula-2 testcase successfully with the installed compilers. PR modula2/108144 libgm2/ * libm2cor/Makefile.am: Revert previous change, instead drop the redundant $(MULTIDIR). * 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/libm2cor/Makefile.am | 18 +++++++++--------- libgm2/libm2cor/Makefile.in | 18 +++++++++--------- libgm2/libm2iso/Makefile.am | 22 +++++++++++----------- libgm2/libm2iso/Makefile.in | 22 +++++++++++----------- libgm2/libm2log/Makefile.am | 18 +++++++++--------- libgm2/libm2log/Makefile.in | 18 +++++++++--------- libgm2/libm2min/Makefile.am | 18 +++++++++--------- libgm2/libm2min/Makefile.in | 18 +++++++++--------- libgm2/libm2pim/Makefile.am | 16 ++++++++-------- libgm2/libm2pim/Makefile.in | 16 ++++++++-------- 10 files changed, 92 insertions(+), 92 deletions(-) (limited to 'libgm2') diff --git a/libgm2/libm2cor/Makefile.am b/libgm2/libm2cor/Makefile.am index b418fca7dd0..2cc30847849 100644 --- a/libgm2/libm2cor/Makefile.am +++ b/libgm2/libm2cor/Makefile.am @@ -139,21 +139,21 @@ SYSTEM.def: Makefile $(LIBTOOL) --tag=CXX --mode=compile $(CXX) -c -I$(srcdir) $(CXXFLAGS) $(LIBCFLAGS) $(libm2cor_la_CFLAGS) $< -o $@ install-data-local: force - mkdir -p $(DESTDIR)$(toolexeclibdir)$(M2LIBDIR) - $(INSTALL_DATA) .libs/libm2cor.la $(DESTDIR)$(toolexeclibdir)$(M2LIBDIR) - chmod 644 $(DESTDIR)$(toolexeclibdir)$(M2LIBDIR)libm2cor.la - $(INSTALL_DATA) .libs/libm2cor.a $(DESTDIR)$(toolexeclibdir)$(M2LIBDIR) - chmod 644 $(DESTDIR)$(toolexeclibdir)$(M2LIBDIR)libm2cor.a - $(RANLIB) $(DESTDIR)$(toolexeclibdir)$(M2LIBDIR)libm2cor.a + mkdir -p $(DESTDIR)$(inst_libdir)/$(M2LIBDIR) + $(INSTALL_DATA) .libs/libm2cor.la $(DESTDIR)$(inst_libdir)/$(M2LIBDIR) + chmod 644 $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)libm2cor.la + $(INSTALL_DATA) .libs/libm2cor.a $(DESTDIR)$(inst_libdir)/$(M2LIBDIR) + chmod 644 $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)libm2cor.a + $(RANLIB) $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)libm2cor.a for i in $(M2DEFS) $(M2MODS) ; do \ if [ -f $$i ] ; then \ - $(INSTALL_DATA) $$i '$(DESTDIR)$(toolexeclibdir)$(M2LIBDIR)'; \ + $(INSTALL_DATA) $$i '$(DESTDIR)$(inst_libdir)/$(M2LIBDIR)'; \ elif [ -f @srcdir@/../../gcc/m2/gm2-libs-coroutines/$$i ] ; then \ - $(INSTALL_DATA) @srcdir@/../../gcc/m2/gm2-libs-coroutines/$$i '$(DESTDIR)$(toolexeclibdir)$(M2LIBDIR)'; \ + $(INSTALL_DATA) @srcdir@/../../gcc/m2/gm2-libs-coroutines/$$i '$(DESTDIR)$(inst_libdir)/$(M2LIBDIR)'; \ else \ echo "cannot find $$i" ; exit 1 ; \ fi ; \ - chmod 644 $(DESTDIR)$(toolexeclibdir)$(M2LIBDIR)$$i ; \ + chmod 644 $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)$$i ; \ done force: diff --git a/libgm2/libm2cor/Makefile.in b/libgm2/libm2cor/Makefile.in index c7efdc5dd6b..8806d7bccf6 100644 --- a/libgm2/libm2cor/Makefile.in +++ b/libgm2/libm2cor/Makefile.in @@ -805,21 +805,21 @@ uninstall-am: uninstall-toolexeclibLTLIBRARIES @BUILD_CORLIB_TRUE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) -c -I$(srcdir) $(CXXFLAGS) $(LIBCFLAGS) $(libm2cor_la_CFLAGS) $< -o $@ @BUILD_CORLIB_TRUE@install-data-local: force -@BUILD_CORLIB_TRUE@ mkdir -p $(DESTDIR)$(toolexeclibdir)$(M2LIBDIR) -@BUILD_CORLIB_TRUE@ $(INSTALL_DATA) .libs/libm2cor.la $(DESTDIR)$(toolexeclibdir)$(M2LIBDIR) -@BUILD_CORLIB_TRUE@ chmod 644 $(DESTDIR)$(toolexeclibdir)$(M2LIBDIR)libm2cor.la -@BUILD_CORLIB_TRUE@ $(INSTALL_DATA) .libs/libm2cor.a $(DESTDIR)$(toolexeclibdir)$(M2LIBDIR) -@BUILD_CORLIB_TRUE@ chmod 644 $(DESTDIR)$(toolexeclibdir)$(M2LIBDIR)libm2cor.a -@BUILD_CORLIB_TRUE@ $(RANLIB) $(DESTDIR)$(toolexeclibdir)$(M2LIBDIR)libm2cor.a +@BUILD_CORLIB_TRUE@ mkdir -p $(DESTDIR)$(inst_libdir)/$(M2LIBDIR) +@BUILD_CORLIB_TRUE@ $(INSTALL_DATA) .libs/libm2cor.la $(DESTDIR)$(inst_libdir)/$(M2LIBDIR) +@BUILD_CORLIB_TRUE@ chmod 644 $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)libm2cor.la +@BUILD_CORLIB_TRUE@ $(INSTALL_DATA) .libs/libm2cor.a $(DESTDIR)$(inst_libdir)/$(M2LIBDIR) +@BUILD_CORLIB_TRUE@ chmod 644 $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)libm2cor.a +@BUILD_CORLIB_TRUE@ $(RANLIB) $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)libm2cor.a @BUILD_CORLIB_TRUE@ for i in $(M2DEFS) $(M2MODS) ; do \ @BUILD_CORLIB_TRUE@ if [ -f $$i ] ; then \ -@BUILD_CORLIB_TRUE@ $(INSTALL_DATA) $$i '$(DESTDIR)$(toolexeclibdir)$(M2LIBDIR)'; \ +@BUILD_CORLIB_TRUE@ $(INSTALL_DATA) $$i '$(DESTDIR)$(inst_libdir)/$(M2LIBDIR)'; \ @BUILD_CORLIB_TRUE@ elif [ -f @srcdir@/../../gcc/m2/gm2-libs-coroutines/$$i ] ; then \ -@BUILD_CORLIB_TRUE@ $(INSTALL_DATA) @srcdir@/../../gcc/m2/gm2-libs-coroutines/$$i '$(DESTDIR)$(toolexeclibdir)$(M2LIBDIR)'; \ +@BUILD_CORLIB_TRUE@ $(INSTALL_DATA) @srcdir@/../../gcc/m2/gm2-libs-coroutines/$$i '$(DESTDIR)$(inst_libdir)/$(M2LIBDIR)'; \ @BUILD_CORLIB_TRUE@ else \ @BUILD_CORLIB_TRUE@ echo "cannot find $$i" ; exit 1 ; \ @BUILD_CORLIB_TRUE@ fi ; \ -@BUILD_CORLIB_TRUE@ chmod 644 $(DESTDIR)$(toolexeclibdir)$(M2LIBDIR)$$i ; \ +@BUILD_CORLIB_TRUE@ chmod 644 $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)$$i ; \ @BUILD_CORLIB_TRUE@ done @BUILD_CORLIB_TRUE@force: diff --git a/libgm2/libm2iso/Makefile.am b/libgm2/libm2iso/Makefile.am index b4eb58aa1a0..a28cd5ac8aa 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)$(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 + mkdir -p $(DESTDIR)$(inst_libdir)/$(M2LIBDIR) + $(INSTALL_DATA) .libs/libm2iso.la $(DESTDIR)$(inst_libdir)/$(M2LIBDIR) + chmod 644 $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)libm2iso.la + $(INSTALL_DATA) .libs/libm2iso.a $(DESTDIR)$(inst_libdir)/$(M2LIBDIR) + chmod 644 $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)/libm2iso.a + $(RANLIB) $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)/libm2iso.a for i in $(M2DEFS) $(M2MODS) ; do \ if [ -f $$i ] ; then \ - $(INSTALL_DATA) $$i '$(DESTDIR)$(toolexeclibdir)$(M2LIBDIR)'; \ + $(INSTALL_DATA) $$i '$(DESTDIR)$(inst_libdir)/$(M2LIBDIR)'; \ elif [ -f @srcdir@/../../gcc/m2/gm2-libs-iso/$$i ] ; then \ - $(INSTALL_DATA) @srcdir@/../../gcc/m2/gm2-libs-iso/$$i '$(DESTDIR)$(toolexeclibdir)$(M2LIBDIR)'; \ + $(INSTALL_DATA) @srcdir@/../../gcc/m2/gm2-libs-iso/$$i '$(DESTDIR)$(inst_libdir)/$(M2LIBDIR)'; \ else \ echo "cannot find $$i" ; exit 1 ; \ fi ; \ - chmod 644 $(DESTDIR)$(toolexeclibdir)$(M2LIBDIR)$$i ; \ + chmod 644 $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)$$i ; \ done for i in $(M2HEADER_FILES) ; do \ if [ -f @srcdir@/$$i ] ; then \ - $(INSTALL_DATA) @srcdir@/$$i '$(DESTDIR)$(toolexeclibdir)$(M2LIBDIR)'; \ + $(INSTALL_DATA) @srcdir@/$$i '$(DESTDIR)$(inst_libdir)/$(M2LIBDIR)'; \ else \ echo "cannot find $$i" ; exit 1 ; \ fi ; \ - chmod 644 $(DESTDIR)$(toolexeclibdir)$(M2LIBDIR)$$i ; \ + chmod 644 $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)$$i ; \ done force: diff --git a/libgm2/libm2iso/Makefile.in b/libgm2/libm2iso/Makefile.in index b8984c6a53b..0ca852a6124 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)$(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@ mkdir -p $(DESTDIR)$(inst_libdir)/$(M2LIBDIR) +@BUILD_ISOLIB_TRUE@ $(INSTALL_DATA) .libs/libm2iso.la $(DESTDIR)$(inst_libdir)/$(M2LIBDIR) +@BUILD_ISOLIB_TRUE@ chmod 644 $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)libm2iso.la +@BUILD_ISOLIB_TRUE@ $(INSTALL_DATA) .libs/libm2iso.a $(DESTDIR)$(inst_libdir)/$(M2LIBDIR) +@BUILD_ISOLIB_TRUE@ chmod 644 $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)/libm2iso.a +@BUILD_ISOLIB_TRUE@ $(RANLIB) $(DESTDIR)$(inst_libdir)/$(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)$(toolexeclibdir)$(M2LIBDIR)'; \ +@BUILD_ISOLIB_TRUE@ $(INSTALL_DATA) $$i '$(DESTDIR)$(inst_libdir)/$(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)$(toolexeclibdir)$(M2LIBDIR)'; \ +@BUILD_ISOLIB_TRUE@ $(INSTALL_DATA) @srcdir@/../../gcc/m2/gm2-libs-iso/$$i '$(DESTDIR)$(inst_libdir)/$(M2LIBDIR)'; \ @BUILD_ISOLIB_TRUE@ else \ @BUILD_ISOLIB_TRUE@ echo "cannot find $$i" ; exit 1 ; \ @BUILD_ISOLIB_TRUE@ fi ; \ -@BUILD_ISOLIB_TRUE@ chmod 644 $(DESTDIR)$(toolexeclibdir)$(M2LIBDIR)$$i ; \ +@BUILD_ISOLIB_TRUE@ chmod 644 $(DESTDIR)$(inst_libdir)/$(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)$(toolexeclibdir)$(M2LIBDIR)'; \ +@BUILD_ISOLIB_TRUE@ $(INSTALL_DATA) @srcdir@/$$i '$(DESTDIR)$(inst_libdir)/$(M2LIBDIR)'; \ @BUILD_ISOLIB_TRUE@ else \ @BUILD_ISOLIB_TRUE@ echo "cannot find $$i" ; exit 1 ; \ @BUILD_ISOLIB_TRUE@ fi ; \ -@BUILD_ISOLIB_TRUE@ chmod 644 $(DESTDIR)$(toolexeclibdir)$(M2LIBDIR)$$i ; \ +@BUILD_ISOLIB_TRUE@ chmod 644 $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)$$i ; \ @BUILD_ISOLIB_TRUE@ done @BUILD_ISOLIB_TRUE@force: diff --git a/libgm2/libm2log/Makefile.am b/libgm2/libm2log/Makefile.am index 1f328d8289e..9b28d3e3d5b 100644 --- a/libgm2/libm2log/Makefile.am +++ b/libgm2/libm2log/Makefile.am @@ -149,21 +149,21 @@ M2LIBDIR = /m2/m2log/ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(GM2_FOR_TARGET) -c $(CFLAGS_FOR_TARGET) $(LIBCFLAGS) $(libm2log_la_M2FLAGS) $< -o $@ install-data-local: force - mkdir -p $(DESTDIR)$(toolexeclibdir)$(M2LIBDIR) - $(INSTALL_DATA) .libs/libm2log.la $(DESTDIR)$(toolexeclibdir)$(M2LIBDIR) - chmod 644 $(DESTDIR)$(toolexeclibdir)$(M2LIBDIR)libm2log.la - $(INSTALL_DATA) .libs/libm2log.a $(DESTDIR)$(toolexeclibdir)$(M2LIBDIR) - chmod 644 $(DESTDIR)$(toolexeclibdir)$(M2LIBDIR)libm2log.a - $(RANLIB) $(DESTDIR)$(toolexeclibdir)$(M2LIBDIR)libm2log.a + mkdir -p $(DESTDIR)$(inst_libdir)/$(M2LIBDIR) + $(INSTALL_DATA) .libs/libm2log.la $(DESTDIR)$(inst_libdir)/$(M2LIBDIR) + chmod 644 $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)libm2log.la + $(INSTALL_DATA) .libs/libm2log.a $(DESTDIR)$(inst_libdir)/$(M2LIBDIR) + chmod 644 $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)libm2log.a + $(RANLIB) $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)libm2log.a for i in $(M2DEFS) $(M2MODS) ; do \ if [ -f $$i ] ; then \ - $(INSTALL_DATA) $$i '$(DESTDIR)$(toolexeclibdir)$(M2LIBDIR)'; \ + $(INSTALL_DATA) $$i '$(DESTDIR)$(inst_libdir)/$(M2LIBDIR)'; \ elif [ -f @srcdir@/../../gcc/m2/gm2-libs-pim/$$i ] ; then \ - $(INSTALL_DATA) @srcdir@/../../gcc/m2/gm2-libs-pim/$$i '$(DESTDIR)$(toolexeclibdir)$(M2LIBDIR)'; \ + $(INSTALL_DATA) @srcdir@/../../gcc/m2/gm2-libs-pim/$$i '$(DESTDIR)$(inst_libdir)/$(M2LIBDIR)'; \ else \ echo "cannot find $$i" ; exit 1 ; \ fi ; \ - chmod 644 $(DESTDIR)$(toolexeclibdir)$(M2LIBDIR)$$i ; \ + chmod 644 $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)$$i ; \ done force: diff --git a/libgm2/libm2log/Makefile.in b/libgm2/libm2log/Makefile.in index b924bb84d81..5afee42c31b 100644 --- a/libgm2/libm2log/Makefile.in +++ b/libgm2/libm2log/Makefile.in @@ -782,21 +782,21 @@ uninstall-am: uninstall-toolexeclibLTLIBRARIES @BUILD_LOGLIB_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(GM2_FOR_TARGET) -c $(CFLAGS_FOR_TARGET) $(LIBCFLAGS) $(libm2log_la_M2FLAGS) $< -o $@ @BUILD_LOGLIB_TRUE@install-data-local: force -@BUILD_LOGLIB_TRUE@ mkdir -p $(DESTDIR)$(toolexeclibdir)$(M2LIBDIR) -@BUILD_LOGLIB_TRUE@ $(INSTALL_DATA) .libs/libm2log.la $(DESTDIR)$(toolexeclibdir)$(M2LIBDIR) -@BUILD_LOGLIB_TRUE@ chmod 644 $(DESTDIR)$(toolexeclibdir)$(M2LIBDIR)libm2log.la -@BUILD_LOGLIB_TRUE@ $(INSTALL_DATA) .libs/libm2log.a $(DESTDIR)$(toolexeclibdir)$(M2LIBDIR) -@BUILD_LOGLIB_TRUE@ chmod 644 $(DESTDIR)$(toolexeclibdir)$(M2LIBDIR)libm2log.a -@BUILD_LOGLIB_TRUE@ $(RANLIB) $(DESTDIR)$(toolexeclibdir)$(M2LIBDIR)libm2log.a +@BUILD_LOGLIB_TRUE@ mkdir -p $(DESTDIR)$(inst_libdir)/$(M2LIBDIR) +@BUILD_LOGLIB_TRUE@ $(INSTALL_DATA) .libs/libm2log.la $(DESTDIR)$(inst_libdir)/$(M2LIBDIR) +@BUILD_LOGLIB_TRUE@ chmod 644 $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)libm2log.la +@BUILD_LOGLIB_TRUE@ $(INSTALL_DATA) .libs/libm2log.a $(DESTDIR)$(inst_libdir)/$(M2LIBDIR) +@BUILD_LOGLIB_TRUE@ chmod 644 $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)libm2log.a +@BUILD_LOGLIB_TRUE@ $(RANLIB) $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)libm2log.a @BUILD_LOGLIB_TRUE@ for i in $(M2DEFS) $(M2MODS) ; do \ @BUILD_LOGLIB_TRUE@ if [ -f $$i ] ; then \ -@BUILD_LOGLIB_TRUE@ $(INSTALL_DATA) $$i '$(DESTDIR)$(toolexeclibdir)$(M2LIBDIR)'; \ +@BUILD_LOGLIB_TRUE@ $(INSTALL_DATA) $$i '$(DESTDIR)$(inst_libdir)/$(M2LIBDIR)'; \ @BUILD_LOGLIB_TRUE@ elif [ -f @srcdir@/../../gcc/m2/gm2-libs-pim/$$i ] ; then \ -@BUILD_LOGLIB_TRUE@ $(INSTALL_DATA) @srcdir@/../../gcc/m2/gm2-libs-pim/$$i '$(DESTDIR)$(toolexeclibdir)$(M2LIBDIR)'; \ +@BUILD_LOGLIB_TRUE@ $(INSTALL_DATA) @srcdir@/../../gcc/m2/gm2-libs-pim/$$i '$(DESTDIR)$(inst_libdir)/$(M2LIBDIR)'; \ @BUILD_LOGLIB_TRUE@ else \ @BUILD_LOGLIB_TRUE@ echo "cannot find $$i" ; exit 1 ; \ @BUILD_LOGLIB_TRUE@ fi ; \ -@BUILD_LOGLIB_TRUE@ chmod 644 $(DESTDIR)$(toolexeclibdir)$(M2LIBDIR)$$i ; \ +@BUILD_LOGLIB_TRUE@ chmod 644 $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)$$i ; \ @BUILD_LOGLIB_TRUE@ done @BUILD_LOGLIB_TRUE@force: diff --git a/libgm2/libm2min/Makefile.am b/libgm2/libm2min/Makefile.am index ae415dc25b3..bbbf3d4f943 100644 --- a/libgm2/libm2min/Makefile.am +++ b/libgm2/libm2min/Makefile.am @@ -132,21 +132,21 @@ SYSTEM.def: Makefile "$(GM2_FOR_TARGET) -fno-exceptions" $@ install-data-local: force - mkdir -p $(DESTDIR)$(toolexeclibdir)$(M2LIBDIR) - $(INSTALL_DATA) .libs/libm2min.la $(DESTDIR)$(toolexeclibdir)$(M2LIBDIR) - chmod 644 $(DESTDIR)$(toolexeclibdir)$(M2LIBDIR)libm2min.la - $(INSTALL_DATA) .libs/libm2min.a $(DESTDIR)$(toolexeclibdir)$(M2LIBDIR) - chmod 644 $(DESTDIR)$(toolexeclibdir)$(M2LIBDIR)libm2min.a - $(RANLIB) $(DESTDIR)$(toolexeclibdir)$(M2LIBDIR)libm2min.a + mkdir -p $(DESTDIR)$(inst_libdir)/$(M2LIBDIR) + $(INSTALL_DATA) .libs/libm2min.la $(DESTDIR)$(inst_libdir)/$(M2LIBDIR) + chmod 644 $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)libm2min.la + $(INSTALL_DATA) .libs/libm2min.a $(DESTDIR)$(inst_libdir)/$(M2LIBDIR) + chmod 644 $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)libm2min.a + $(RANLIB) $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)libm2min.a for i in $(M2DEFS) $(M2MODS) ; do \ if [ -f $$i ] ; then \ - $(INSTALL_DATA) $$i '$(DESTDIR)$(toolexeclibdir)$(M2LIBDIR)'; \ + $(INSTALL_DATA) $$i '$(DESTDIR)$(inst_libdir)/$(M2LIBDIR)'; \ elif [ -f @srcdir@/../../gcc/m2/gm2-libs-min/$$i ] ; then \ - $(INSTALL_DATA) @srcdir@/../../gcc/m2/gm2-libs-min/$$i '$(DESTDIR)$(toolexeclibdir)$(M2LIBDIR)'; \ + $(INSTALL_DATA) @srcdir@/../../gcc/m2/gm2-libs-min/$$i '$(DESTDIR)$(inst_libdir)/$(M2LIBDIR)'; \ else \ echo "cannot find $$i" ; exit 1 ; \ fi ; \ - chmod 644 $(DESTDIR)$(toolexeclibdir)$(M2LIBDIR)$$i ; \ + chmod 644 $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)$$i ; \ done force: diff --git a/libgm2/libm2min/Makefile.in b/libgm2/libm2min/Makefile.in index 6dbcaa14b04..ad818bc01d5 100644 --- a/libgm2/libm2min/Makefile.in +++ b/libgm2/libm2min/Makefile.in @@ -758,21 +758,21 @@ SYSTEM.def: Makefile "$(GM2_FOR_TARGET) -fno-exceptions" $@ install-data-local: force - mkdir -p $(DESTDIR)$(toolexeclibdir)$(M2LIBDIR) - $(INSTALL_DATA) .libs/libm2min.la $(DESTDIR)$(toolexeclibdir)$(M2LIBDIR) - chmod 644 $(DESTDIR)$(toolexeclibdir)$(M2LIBDIR)libm2min.la - $(INSTALL_DATA) .libs/libm2min.a $(DESTDIR)$(toolexeclibdir)$(M2LIBDIR) - chmod 644 $(DESTDIR)$(toolexeclibdir)$(M2LIBDIR)libm2min.a - $(RANLIB) $(DESTDIR)$(toolexeclibdir)$(M2LIBDIR)libm2min.a + mkdir -p $(DESTDIR)$(inst_libdir)/$(M2LIBDIR) + $(INSTALL_DATA) .libs/libm2min.la $(DESTDIR)$(inst_libdir)/$(M2LIBDIR) + chmod 644 $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)libm2min.la + $(INSTALL_DATA) .libs/libm2min.a $(DESTDIR)$(inst_libdir)/$(M2LIBDIR) + chmod 644 $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)libm2min.a + $(RANLIB) $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)libm2min.a for i in $(M2DEFS) $(M2MODS) ; do \ if [ -f $$i ] ; then \ - $(INSTALL_DATA) $$i '$(DESTDIR)$(toolexeclibdir)$(M2LIBDIR)'; \ + $(INSTALL_DATA) $$i '$(DESTDIR)$(inst_libdir)/$(M2LIBDIR)'; \ elif [ -f @srcdir@/../../gcc/m2/gm2-libs-min/$$i ] ; then \ - $(INSTALL_DATA) @srcdir@/../../gcc/m2/gm2-libs-min/$$i '$(DESTDIR)$(toolexeclibdir)$(M2LIBDIR)'; \ + $(INSTALL_DATA) @srcdir@/../../gcc/m2/gm2-libs-min/$$i '$(DESTDIR)$(inst_libdir)/$(M2LIBDIR)'; \ else \ echo "cannot find $$i" ; exit 1 ; \ fi ; \ - chmod 644 $(DESTDIR)$(toolexeclibdir)$(M2LIBDIR)$$i ; \ + chmod 644 $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)$$i ; \ done force: diff --git a/libgm2/libm2pim/Makefile.am b/libgm2/libm2pim/Makefile.am index f860a7d8bb9..35fefae59c1 100644 --- a/libgm2/libm2pim/Makefile.am +++ b/libgm2/libm2pim/Makefile.am @@ -192,20 +192,20 @@ SYSTEM.def: Makefile $(LIBTOOL) --tag=CXX --mode=compile $(CXX) -c -I$(srcdir) $(CXXFLAGS) $(LIBCFLAGS) $(libm2pim_la_CFLAGS) $< -o $@ install-data-local: force - mkdir -p $(DESTDIR)$(toolexeclibdir)$(M2LIBDIR) - $(INSTALL_DATA) .libs/libm2pim.la $(DESTDIR)$(toolexeclibdir)$(M2LIBDIR) - chmod 644 $(DESTDIR)$(toolexeclibdir)$(M2LIBDIR)libm2pim.la - $(INSTALL_DATA) .libs/libm2pim.a $(DESTDIR)$(toolexeclibdir)$(M2LIBDIR) - $(RANLIB) $(DESTDIR)$(toolexeclibdir)$(M2LIBDIR)libm2pim.a + mkdir -p $(DESTDIR)$(inst_libdir)/$(M2LIBDIR) + $(INSTALL_DATA) .libs/libm2pim.la $(DESTDIR)$(inst_libdir)/$(M2LIBDIR) + chmod 644 $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)libm2pim.la + $(INSTALL_DATA) .libs/libm2pim.a $(DESTDIR)$(inst_libdir)/$(M2LIBDIR) + $(RANLIB) $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)libm2pim.a for i in $(M2DEFS) $(M2MODS) ; do \ if [ -f $$i ] ; then \ - $(INSTALL_DATA) $$i '$(DESTDIR)$(toolexeclibdir)$(M2LIBDIR)'; \ + $(INSTALL_DATA) $$i '$(DESTDIR)$(inst_libdir)/$(M2LIBDIR)'; \ elif [ -f @srcdir@/../../gcc/m2/gm2-libs/$$i ] ; then \ - $(INSTALL_DATA) @srcdir@/../../gcc/m2/gm2-libs/$$i '$(DESTDIR)$(toolexeclibdir)$(M2LIBDIR)'; \ + $(INSTALL_DATA) @srcdir@/../../gcc/m2/gm2-libs/$$i '$(DESTDIR)$(inst_libdir)/$(M2LIBDIR)'; \ else \ echo "cannot find $$i" ; exit 1 ; \ fi ; \ - chmod 644 $(DESTDIR)$(toolexeclibdir)$(M2LIBDIR)$$i ; \ + chmod 644 $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)$$i ; \ done force: diff --git a/libgm2/libm2pim/Makefile.in b/libgm2/libm2pim/Makefile.in index a46b5ff0dec..85754b6195b 100644 --- a/libgm2/libm2pim/Makefile.in +++ b/libgm2/libm2pim/Makefile.in @@ -892,20 +892,20 @@ uninstall-am: uninstall-toolexeclibLTLIBRARIES @BUILD_PIMLIB_TRUE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) -c -I$(srcdir) $(CXXFLAGS) $(LIBCFLAGS) $(libm2pim_la_CFLAGS) $< -o $@ @BUILD_PIMLIB_TRUE@install-data-local: force -@BUILD_PIMLIB_TRUE@ mkdir -p $(DESTDIR)$(toolexeclibdir)$(M2LIBDIR) -@BUILD_PIMLIB_TRUE@ $(INSTALL_DATA) .libs/libm2pim.la $(DESTDIR)$(toolexeclibdir)$(M2LIBDIR) -@BUILD_PIMLIB_TRUE@ chmod 644 $(DESTDIR)$(toolexeclibdir)$(M2LIBDIR)libm2pim.la -@BUILD_PIMLIB_TRUE@ $(INSTALL_DATA) .libs/libm2pim.a $(DESTDIR)$(toolexeclibdir)$(M2LIBDIR) -@BUILD_PIMLIB_TRUE@ $(RANLIB) $(DESTDIR)$(toolexeclibdir)$(M2LIBDIR)libm2pim.a +@BUILD_PIMLIB_TRUE@ mkdir -p $(DESTDIR)$(inst_libdir)/$(M2LIBDIR) +@BUILD_PIMLIB_TRUE@ $(INSTALL_DATA) .libs/libm2pim.la $(DESTDIR)$(inst_libdir)/$(M2LIBDIR) +@BUILD_PIMLIB_TRUE@ chmod 644 $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)libm2pim.la +@BUILD_PIMLIB_TRUE@ $(INSTALL_DATA) .libs/libm2pim.a $(DESTDIR)$(inst_libdir)/$(M2LIBDIR) +@BUILD_PIMLIB_TRUE@ $(RANLIB) $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)libm2pim.a @BUILD_PIMLIB_TRUE@ for i in $(M2DEFS) $(M2MODS) ; do \ @BUILD_PIMLIB_TRUE@ if [ -f $$i ] ; then \ -@BUILD_PIMLIB_TRUE@ $(INSTALL_DATA) $$i '$(DESTDIR)$(toolexeclibdir)$(M2LIBDIR)'; \ +@BUILD_PIMLIB_TRUE@ $(INSTALL_DATA) $$i '$(DESTDIR)$(inst_libdir)/$(M2LIBDIR)'; \ @BUILD_PIMLIB_TRUE@ elif [ -f @srcdir@/../../gcc/m2/gm2-libs/$$i ] ; then \ -@BUILD_PIMLIB_TRUE@ $(INSTALL_DATA) @srcdir@/../../gcc/m2/gm2-libs/$$i '$(DESTDIR)$(toolexeclibdir)$(M2LIBDIR)'; \ +@BUILD_PIMLIB_TRUE@ $(INSTALL_DATA) @srcdir@/../../gcc/m2/gm2-libs/$$i '$(DESTDIR)$(inst_libdir)/$(M2LIBDIR)'; \ @BUILD_PIMLIB_TRUE@ else \ @BUILD_PIMLIB_TRUE@ echo "cannot find $$i" ; exit 1 ; \ @BUILD_PIMLIB_TRUE@ fi ; \ -@BUILD_PIMLIB_TRUE@ chmod 644 $(DESTDIR)$(toolexeclibdir)$(M2LIBDIR)$$i ; \ +@BUILD_PIMLIB_TRUE@ chmod 644 $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)$$i ; \ @BUILD_PIMLIB_TRUE@ done @BUILD_PIMLIB_TRUE@force: -- cgit v1.2.1