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.

diff --git a/libgm2/Makefile.am b/libgm2/Makefile.am
index 524ea6c7124075f3637d5c94a9fb8feb37e2c049..0b593f6ff216e9058bf2a477026d4df4c8c27ba5 100644 (file)
--- a/libgm2/Makefile.am
+++ b/libgm2/Makefile.am
@@ -69,10 +69,6 @@ AM_MAKEFLAGS = \
        "LIBCFLAGS_FOR_TARGET=$(LIBCFLAGS_FOR_TARGET)" \
        "MAKE=$(MAKE)" \
        "MAKEINFO=$(MAKEINFO) $(MAKEINFOFLAGS)" \
-        "MULTIBUILDTOP=$(MULTIBUILDTOP)" \
-        "MULTISUBDIR=$(MULTISUBDIR)" \
-        "MULTIOSDIR=$(MULTIDIR)" \
-        "MULTIFLAGS=$(MULTIFLAGS)" \
        "PICFLAG=$(PICFLAG)" \
        "PICFLAG_FOR_TARGET=$(PICFLAG_FOR_TARGET)" \
        "SHELL=$(SHELL)" \

diff --git a/libgm2/Makefile.in b/libgm2/Makefile.in
index ac01eafe45cf50f73241eedef7c166ba107f8e6b..da2ec7c2a098da26b0b2f9e75e80390f9f6ca239 100644 (file)
--- a/libgm2/Makefile.in
+++ b/libgm2/Makefile.in
@@ -368,10 +368,6 @@ AM_MAKEFLAGS = \
        "LIBCFLAGS_FOR_TARGET=$(LIBCFLAGS_FOR_TARGET)" \
        "MAKE=$(MAKE)" \
        "MAKEINFO=$(MAKEINFO) $(MAKEINFOFLAGS)" \
-        "MULTIBUILDTOP=$(MULTIBUILDTOP)" \
-        "MULTISUBDIR=$(MULTISUBDIR)" \
-        "MULTIOSDIR=$(MULTIDIR)" \
-        "MULTIFLAGS=$(MULTIFLAGS)" \
        "PICFLAG=$(PICFLAG)" \
        "PICFLAG_FOR_TARGET=$(PICFLAG_FOR_TARGET)" \
        "SHELL=$(SHELL)" \

diff --git a/libgm2/configure b/libgm2/configure
index 8b2c28cb163d540949bd2f653a9e8332098ad7bf..8eb1bc81c66362dd399fb73ad6edfff3890b633e 100755 (executable)
--- a/libgm2/configure
+++ b/libgm2/configure
@@ -6575,6 +6575,10 @@ fi
 
 
 
+enable_dlopen=yes
+
+
+
 case `pwd` in
   *\ * | *\    *)
     { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
@@ -9193,8 +9197,6 @@ done
 
 
 
-        enable_dlopen=no
-
 
   enable_win32_dll=no
 
@@ -12704,7 +12706,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 12707 "configure"
+#line 12709 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12810,7 +12812,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 12813 "configure"
+#line 12815 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -16087,13 +16089,14 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 # Only expand once:
 
 
-enable_dlopen=yes
-
 
 
-# AM_PROG_LIBTOOL
-
 
+if test "${multilib}" = "yes"; then
+  multilib_arg="--enable-multilib"
+else
+  multilib_arg=
+fi
 
 ac_fn_c_check_type "$LINENO" "struct timezone" "ac_cv_type_struct_timezone" "$ac_includes_default"
 if test "x$ac_cv_type_struct_timezone" = xyes; then :
@@ -19716,7 +19719,10 @@ fi
 
 
 
-ac_config_files="$ac_config_files Makefile libm2min/Makefile libm2pim/Makefile libm2iso/Makefile libm2cor/Makefile libm2log/Makefile"
+ac_config_files="$ac_config_files Makefile"
+
+
+ac_config_files="$ac_config_files libm2min/Makefile libm2pim/Makefile libm2iso/Makefile libm2cor/Makefile libm2log/Makefile"
 
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: libgm2 has been configured." >&5
@@ -22368,6 +22374,61 @@ compiler_lib_search_path=$lt_compiler_lib_search_path_CXX
 # ### END LIBTOOL TAG CONFIG: CXX
 _LT_EOF
 
+ ;;
+    "libm2min/Makefile":F)  cat > vpsed$$ << \_EOF
+s!`test -f '$<' || echo '$(srcdir)/'`!!
+_EOF
+   sed -f vpsed$$ $ac_file > tmp$$
+   mv tmp$$ $ac_file
+   rm vpsed$$
+   echo 'MULTISUBDIR =' >> $ac_file
+   ml_norecursion=yes
+   . ${multi_basedir}/config-ml.in
+   { ml_norecursion=; unset ml_norecursion;}
+ ;;
+    "libm2pim/Makefile":F)  cat > vpsed$$ << \_EOF
+s!`test -f '$<' || echo '$(srcdir)/'`!!
+_EOF
+   sed -f vpsed$$ $ac_file > tmp$$
+   mv tmp$$ $ac_file
+   rm vpsed$$
+   echo 'MULTISUBDIR =' >> $ac_file
+   ml_norecursion=yes
+   . ${multi_basedir}/config-ml.in
+   { ml_norecursion=; unset ml_norecursion;}
+ ;;
+    "libm2iso/Makefile":F)  cat > vpsed$$ << \_EOF
+s!`test -f '$<' || echo '$(srcdir)/'`!!
+_EOF
+   sed -f vpsed$$ $ac_file > tmp$$
+   mv tmp$$ $ac_file
+   rm vpsed$$
+   echo 'MULTISUBDIR =' >> $ac_file
+   ml_norecursion=yes
+   . ${multi_basedir}/config-ml.in
+   { ml_norecursion=; unset ml_norecursion;}
+ ;;
+    "libm2cor/Makefile":F)  cat > vpsed$$ << \_EOF
+s!`test -f '$<' || echo '$(srcdir)/'`!!
+_EOF
+   sed -f vpsed$$ $ac_file > tmp$$
+   mv tmp$$ $ac_file
+   rm vpsed$$
+   echo 'MULTISUBDIR =' >> $ac_file
+   ml_norecursion=yes
+   . ${multi_basedir}/config-ml.in
+   { ml_norecursion=; unset ml_norecursion;}
+ ;;
+    "libm2log/Makefile":F)  cat > vpsed$$ << \_EOF
+s!`test -f '$<' || echo '$(srcdir)/'`!!
+_EOF
+   sed -f vpsed$$ $ac_file > tmp$$
+   mv tmp$$ $ac_file
+   rm vpsed$$
+   echo 'MULTISUBDIR =' >> $ac_file
+   ml_norecursion=yes
+   . ${multi_basedir}/config-ml.in
+   { ml_norecursion=; unset ml_norecursion;}
  ;;
 
   esac

diff --git a/libgm2/configure.ac b/libgm2/configure.ac
index c2732943c21f5d0646033bc704aabd503b2642aa..843622eb6379b92dc308c530f563e31843f7c1fb 100644 (file)
--- a/libgm2/configure.ac
+++ b/libgm2/configure.ac
@@ -177,12 +177,17 @@ AC_PATH_PROG(PERL, perl, perl-not-found-in-path-error)
 AC_PROG_MAKE_SET
 AC_PROG_INSTALL
 
-LT_INIT
 AC_LIBTOOL_DLOPEN
-# AM_PROG_LIBTOOL
+AM_PROG_LIBTOOL
 AC_SUBST(enable_shared)
 AC_SUBST(enable_static)
 
+if test "${multilib}" = "yes"; then
+  multilib_arg="--enable-multilib"
+else
+  multilib_arg=
+fi
+
 AC_CHECK_TYPES([struct timezone, struct stat, struct timeval])
 
 AC_LANG_C
@@ -385,8 +390,20 @@ AM_CONDITIONAL([TARGET_DARWIN], [test x$M2_TARGET_OS = xdarwin])
 GCC_BASE_VER
 
 AC_CONFIG_SRCDIR([Makefile.am])
-AC_CONFIG_FILES([Makefile libm2min/Makefile libm2pim/Makefile libm2iso/Makefile
-                 libm2cor/Makefile libm2log/Makefile])
+AC_CONFIG_FILES([Makefile])
+
+AC_CONFIG_FILES(AC_FOREACH([DIR], [libm2min libm2pim libm2iso libm2cor libm2log], [DIR/Makefile ]),
+ [ cat > vpsed$$ << \_EOF
+s!`test -f '$<' || echo '$(srcdir)/'`!!
+_EOF
+   sed -f vpsed$$ $ac_file > tmp$$
+   mv tmp$$ $ac_file
+   rm vpsed$$
+   echo 'MULTISUBDIR =' >> $ac_file
+   ml_norecursion=yes
+   . ${multi_basedir}/config-ml.in
+   AS_UNSET([ml_norecursion])
+])
 
 AC_MSG_NOTICE([libgm2 has been configured.])
 

diff --git a/libgm2/libm2cor/Makefile.am b/libgm2/libm2cor/Makefile.am
index 3f4b5085d1ad42217c293121d185da1d3909f688..b418fca7dd050c13e58c3a4670c96800825bb7b7 100644 (file)
--- 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)$(inst_libdir)/$(MULTIDIR)$(M2LIBDIR)
-       $(INSTALL_DATA) .libs/libm2cor.la $(DESTDIR)$(inst_libdir)/$(MULTIDIR)$(M2LIBDIR)
-       chmod 644 $(DESTDIR)$(inst_libdir)/$(MULTIDIR)$(M2LIBDIR)libm2cor.la
-       $(INSTALL_DATA) .libs/libm2cor.a $(DESTDIR)$(inst_libdir)/$(MULTIDIR)$(M2LIBDIR)
-       chmod 644 $(DESTDIR)$(inst_libdir)/$(MULTIDIR)$(M2LIBDIR)libm2cor.a
-       $(RANLIB) $(DESTDIR)$(inst_libdir)/$(MULTIDIR)$(M2LIBDIR)libm2cor.a
+       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
        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-coroutines/$$i ] ; then \
-              $(INSTALL_DATA) @srcdir@/../../gcc/m2/gm2-libs-coroutines/$$i '$(DESTDIR)$(inst_libdir)/$(MULTIDIR)$(M2LIBDIR)'; \
+              $(INSTALL_DATA) @srcdir@/../../gcc/m2/gm2-libs-coroutines/$$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/libm2cor/Makefile.in b/libgm2/libm2cor/Makefile.in
index 2820a8a6f96f526715bab89148ecc602945ae1f1..c7efdc5dd6bbb1c5439eedd9265e758993db35a1 100644 (file)
--- 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)$(inst_libdir)/$(MULTIDIR)$(M2LIBDIR)
-@BUILD_CORLIB_TRUE@    $(INSTALL_DATA) .libs/libm2cor.la $(DESTDIR)$(inst_libdir)/$(MULTIDIR)$(M2LIBDIR)
-@BUILD_CORLIB_TRUE@    chmod 644 $(DESTDIR)$(inst_libdir)/$(MULTIDIR)$(M2LIBDIR)libm2cor.la
-@BUILD_CORLIB_TRUE@    $(INSTALL_DATA) .libs/libm2cor.a $(DESTDIR)$(inst_libdir)/$(MULTIDIR)$(M2LIBDIR)
-@BUILD_CORLIB_TRUE@    chmod 644 $(DESTDIR)$(inst_libdir)/$(MULTIDIR)$(M2LIBDIR)libm2cor.a
-@BUILD_CORLIB_TRUE@    $(RANLIB) $(DESTDIR)$(inst_libdir)/$(MULTIDIR)$(M2LIBDIR)libm2cor.a
+@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@    for i in $(M2DEFS) $(M2MODS) ; do \
 @BUILD_CORLIB_TRUE@           if [ -f $$i ] ; then \
-@BUILD_CORLIB_TRUE@              $(INSTALL_DATA) $$i '$(DESTDIR)$(inst_libdir)/$(MULTIDIR)$(M2LIBDIR)'; \
+@BUILD_CORLIB_TRUE@              $(INSTALL_DATA) $$i '$(DESTDIR)$(toolexeclibdir)$(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)$(inst_libdir)/$(MULTIDIR)$(M2LIBDIR)'; \
+@BUILD_CORLIB_TRUE@              $(INSTALL_DATA) @srcdir@/../../gcc/m2/gm2-libs-coroutines/$$i '$(DESTDIR)$(toolexeclibdir)$(M2LIBDIR)'; \
 @BUILD_CORLIB_TRUE@           else \
 @BUILD_CORLIB_TRUE@              echo "cannot find $$i" ; exit 1 ; \
 @BUILD_CORLIB_TRUE@           fi ; \
-@BUILD_CORLIB_TRUE@           chmod 644 $(DESTDIR)$(inst_libdir)/$(MULTIDIR)$(M2LIBDIR)$$i ; \
+@BUILD_CORLIB_TRUE@           chmod 644 $(DESTDIR)$(toolexeclibdir)$(M2LIBDIR)$$i ; \
 @BUILD_CORLIB_TRUE@    done
 
 @BUILD_CORLIB_TRUE@force:

diff --git a/libgm2/libm2iso/Makefile.am b/libgm2/libm2iso/Makefile.am
index 90917bbba7b7371c0c079603aa9b40075edcc4e1..b4eb58aa1a02b14bec36d277438bdab60ab93292 100644 (file)
--- 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 fe77b9d3697bbd30f81f012b29ab33e88da5324a..b8984c6a53b0319f339c833bb7be15061caf028d 100644 (file)
--- 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:

diff --git a/libgm2/libm2log/Makefile.am b/libgm2/libm2log/Makefile.am
index 915438e3ec9ad34aae9a9c4388d47bc355e88f2e..1f328d8289e5a5e490b71e0c79843af41b1af0c4 100644 (file)
--- 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)$(inst_libdir)/$(MULTIDIR)$(M2LIBDIR)
-       $(INSTALL_DATA) .libs/libm2log.la $(DESTDIR)$(inst_libdir)/$(MULTIDIR)$(M2LIBDIR)
-       chmod 644 $(DESTDIR)$(inst_libdir)/$(MULTIDIR)$(M2LIBDIR)libm2log.la
-       $(INSTALL_DATA) .libs/libm2log.a $(DESTDIR)$(inst_libdir)/$(MULTIDIR)$(M2LIBDIR)
-       chmod 644 $(DESTDIR)$(inst_libdir)/$(MULTIDIR)$(M2LIBDIR)libm2log.a
-       $(RANLIB) $(DESTDIR)$(inst_libdir)/$(MULTIDIR)$(M2LIBDIR)libm2log.a
+       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
        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-pim/$$i ] ; then \
-              $(INSTALL_DATA) @srcdir@/../../gcc/m2/gm2-libs-pim/$$i '$(DESTDIR)$(inst_libdir)/$(MULTIDIR)$(M2LIBDIR)'; \
+              $(INSTALL_DATA) @srcdir@/../../gcc/m2/gm2-libs-pim/$$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/libm2log/Makefile.in b/libgm2/libm2log/Makefile.in
index 47a980c771ad4d46caa02a28f153cc213d2e6436..b924bb84d81cd119f541538cf534743aa276c5bd 100644 (file)
--- 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)$(inst_libdir)/$(MULTIDIR)$(M2LIBDIR)
-@BUILD_LOGLIB_TRUE@    $(INSTALL_DATA) .libs/libm2log.la $(DESTDIR)$(inst_libdir)/$(MULTIDIR)$(M2LIBDIR)
-@BUILD_LOGLIB_TRUE@    chmod 644 $(DESTDIR)$(inst_libdir)/$(MULTIDIR)$(M2LIBDIR)libm2log.la
-@BUILD_LOGLIB_TRUE@    $(INSTALL_DATA) .libs/libm2log.a $(DESTDIR)$(inst_libdir)/$(MULTIDIR)$(M2LIBDIR)
-@BUILD_LOGLIB_TRUE@    chmod 644 $(DESTDIR)$(inst_libdir)/$(MULTIDIR)$(M2LIBDIR)libm2log.a
-@BUILD_LOGLIB_TRUE@    $(RANLIB) $(DESTDIR)$(inst_libdir)/$(MULTIDIR)$(M2LIBDIR)libm2log.a
+@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@    for i in $(M2DEFS) $(M2MODS) ; do \
 @BUILD_LOGLIB_TRUE@           if [ -f $$i ] ; then \
-@BUILD_LOGLIB_TRUE@              $(INSTALL_DATA) $$i '$(DESTDIR)$(inst_libdir)/$(MULTIDIR)$(M2LIBDIR)'; \
+@BUILD_LOGLIB_TRUE@              $(INSTALL_DATA) $$i '$(DESTDIR)$(toolexeclibdir)$(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)$(inst_libdir)/$(MULTIDIR)$(M2LIBDIR)'; \
+@BUILD_LOGLIB_TRUE@              $(INSTALL_DATA) @srcdir@/../../gcc/m2/gm2-libs-pim/$$i '$(DESTDIR)$(toolexeclibdir)$(M2LIBDIR)'; \
 @BUILD_LOGLIB_TRUE@           else \
 @BUILD_LOGLIB_TRUE@              echo "cannot find $$i" ; exit 1 ; \
 @BUILD_LOGLIB_TRUE@           fi ; \
-@BUILD_LOGLIB_TRUE@           chmod 644 $(DESTDIR)$(inst_libdir)/$(MULTIDIR)$(M2LIBDIR)$$i ; \
+@BUILD_LOGLIB_TRUE@           chmod 644 $(DESTDIR)$(toolexeclibdir)$(M2LIBDIR)$$i ; \
 @BUILD_LOGLIB_TRUE@    done
 
 @BUILD_LOGLIB_TRUE@force:

diff --git a/libgm2/libm2min/Makefile.am b/libgm2/libm2min/Makefile.am
index b2f145a63be406325adb8c636051d75cb94b5eb2..ae415dc25b36fa0a3c7c575211a7b019269ef5e0 100644 (file)
--- 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)$(inst_libdir)/$(MULTIDIR)$(M2LIBDIR)
-       $(INSTALL_DATA) .libs/libm2min.la $(DESTDIR)$(inst_libdir)/$(MULTIDIR)$(M2LIBDIR)
-       chmod 644 $(DESTDIR)$(inst_libdir)/$(MULTIDIR)$(M2LIBDIR)libm2min.la
-       $(INSTALL_DATA) .libs/libm2min.a $(DESTDIR)$(inst_libdir)/$(MULTIDIR)$(M2LIBDIR)
-       chmod 644 $(DESTDIR)$(inst_libdir)/$(MULTIDIR)$(M2LIBDIR)libm2min.a
-       $(RANLIB) $(DESTDIR)$(inst_libdir)/$(MULTIDIR)$(M2LIBDIR)libm2min.a
+       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
        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-min/$$i ] ; then \
-              $(INSTALL_DATA) @srcdir@/../../gcc/m2/gm2-libs-min/$$i '$(DESTDIR)$(inst_libdir)/$(MULTIDIR)$(M2LIBDIR)'; \
+              $(INSTALL_DATA) @srcdir@/../../gcc/m2/gm2-libs-min/$$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/libm2min/Makefile.in b/libgm2/libm2min/Makefile.in
index efbfe09b0a80432cc792e1f2f733106a56f7ec3e..6dbcaa14b04c36be23f7d90627bd188aa659dc84 100644 (file)
--- 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)$(inst_libdir)/$(MULTIDIR)$(M2LIBDIR)
-       $(INSTALL_DATA) .libs/libm2min.la $(DESTDIR)$(inst_libdir)/$(MULTIDIR)$(M2LIBDIR)
-       chmod 644 $(DESTDIR)$(inst_libdir)/$(MULTIDIR)$(M2LIBDIR)libm2min.la
-       $(INSTALL_DATA) .libs/libm2min.a $(DESTDIR)$(inst_libdir)/$(MULTIDIR)$(M2LIBDIR)
-       chmod 644 $(DESTDIR)$(inst_libdir)/$(MULTIDIR)$(M2LIBDIR)libm2min.a
-       $(RANLIB) $(DESTDIR)$(inst_libdir)/$(MULTIDIR)$(M2LIBDIR)libm2min.a
+       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
        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-min/$$i ] ; then \
-              $(INSTALL_DATA) @srcdir@/../../gcc/m2/gm2-libs-min/$$i '$(DESTDIR)$(inst_libdir)/$(MULTIDIR)$(M2LIBDIR)'; \
+              $(INSTALL_DATA) @srcdir@/../../gcc/m2/gm2-libs-min/$$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/libm2pim/Makefile.am b/libgm2/libm2pim/Makefile.am
index c1a189adb91afd135ccbdc76e1ecaecc02fb1b66..f860a7d8bb9db5f3385a5694c23e7a14d950afd3 100644 (file)
--- 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)$(inst_libdir)/$(MULTIDIR)$(M2LIBDIR)
-       $(INSTALL_DATA) .libs/libm2pim.la $(DESTDIR)$(inst_libdir)/$(MULTIDIR)$(M2LIBDIR)
-       chmod 644 $(DESTDIR)$(inst_libdir)/$(MULTIDIR)$(M2LIBDIR)libm2pim.la
-       $(INSTALL_DATA) .libs/libm2pim.a $(DESTDIR)$(inst_libdir)/$(MULTIDIR)$(M2LIBDIR)
-       $(RANLIB) $(DESTDIR)$(inst_libdir)/$(MULTIDIR)$(M2LIBDIR)libm2pim.a
+       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
        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/$$i ] ; then \
-              $(INSTALL_DATA) @srcdir@/../../gcc/m2/gm2-libs/$$i '$(DESTDIR)$(inst_libdir)/$(MULTIDIR)$(M2LIBDIR)'; \
+              $(INSTALL_DATA) @srcdir@/../../gcc/m2/gm2-libs/$$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/libm2pim/Makefile.in b/libgm2/libm2pim/Makefile.in
index 44ee4e28426ad3bb99c4828936b421a80a9b193a..a46b5ff0dec04777b08164a710c075fd7d954ce8 100644 (file)
--- 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)$(inst_libdir)/$(MULTIDIR)$(M2LIBDIR)
-@BUILD_PIMLIB_TRUE@    $(INSTALL_DATA) .libs/libm2pim.la $(DESTDIR)$(inst_libdir)/$(MULTIDIR)$(M2LIBDIR)
-@BUILD_PIMLIB_TRUE@    chmod 644 $(DESTDIR)$(inst_libdir)/$(MULTIDIR)$(M2LIBDIR)libm2pim.la
-@BUILD_PIMLIB_TRUE@    $(INSTALL_DATA) .libs/libm2pim.a $(DESTDIR)$(inst_libdir)/$(MULTIDIR)$(M2LIBDIR)
-@BUILD_PIMLIB_TRUE@    $(RANLIB) $(DESTDIR)$(inst_libdir)/$(MULTIDIR)$(M2LIBDIR)libm2pim.a
+@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@    for i in $(M2DEFS) $(M2MODS) ; do \
 @BUILD_PIMLIB_TRUE@           if [ -f $$i ] ; then \
-@BUILD_PIMLIB_TRUE@              $(INSTALL_DATA) $$i '$(DESTDIR)$(inst_libdir)/$(MULTIDIR)$(M2LIBDIR)'; \
+@BUILD_PIMLIB_TRUE@              $(INSTALL_DATA) $$i '$(DESTDIR)$(toolexeclibdir)$(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)$(inst_libdir)/$(MULTIDIR)$(M2LIBDIR)'; \
+@BUILD_PIMLIB_TRUE@              $(INSTALL_DATA) @srcdir@/../../gcc/m2/gm2-libs/$$i '$(DESTDIR)$(toolexeclibdir)$(M2LIBDIR)'; \
 @BUILD_PIMLIB_TRUE@           else \
 @BUILD_PIMLIB_TRUE@              echo "cannot find $$i" ; exit 1 ; \
 @BUILD_PIMLIB_TRUE@           fi ; \
-@BUILD_PIMLIB_TRUE@           chmod 644 $(DESTDIR)$(inst_libdir)/$(MULTIDIR)$(M2LIBDIR)$$i ; \
+@BUILD_PIMLIB_TRUE@           chmod 644 $(DESTDIR)$(toolexeclibdir)$(M2LIBDIR)$$i ; \
 @BUILD_PIMLIB_TRUE@    done
 
 @BUILD_PIMLIB_TRUE@force: