Mark Wielaard 4fb41b
diff --git a/Makefile.all.am b/Makefile.all.am
Mark Wielaard 4fb41b
index 3786e34..1befef5 100644
Mark Wielaard 4fb41b
--- a/Makefile.all.am
Mark Wielaard 4fb41b
+++ b/Makefile.all.am
Mark Wielaard 4fb41b
@@ -50,20 +50,20 @@ inplace-noinst_DSYMS: build-noinst_DSYMS
Mark Wielaard 4fb41b
 	done
Mark Wielaard 4fb41b
 
Mark Wielaard 4fb41b
 # This is used by coregrind/Makefile.am and by <tool>/Makefile.am for doing
Mark Wielaard 4fb41b
-# "make install".  It copies $(noinst_PROGRAMS) into $prefix/lib/valgrind/.
Mark Wielaard 4fb41b
+# "make install".  It copies $(noinst_PROGRAMS) into $prefix/libexec/valgrind/.
Mark Wielaard 4fb41b
 # It needs to be depended on by an 'install-exec-local' rule.
Mark Wielaard 4fb41b
 install-noinst_PROGRAMS: $(noinst_PROGRAMS)
Mark Wielaard 4fb41b
-	$(mkinstalldirs) $(DESTDIR)$(pkglibdir); \
Mark Wielaard 4fb41b
+	$(mkinstalldirs) $(DESTDIR)$(pkglibexecdir); \
Mark Wielaard 4fb41b
 	for f in $(noinst_PROGRAMS); do \
Mark Wielaard 4fb41b
-	  $(INSTALL_PROGRAM) $$f $(DESTDIR)$(pkglibdir); \
Mark Wielaard 4fb41b
+	  $(INSTALL_PROGRAM) $$f $(DESTDIR)$(pkglibexecdir); \
Mark Wielaard 4fb41b
 	done
Mark Wielaard 4fb41b
 
Mark Wielaard 4fb41b
 # This is used by coregrind/Makefile.am and by <tool>/Makefile.am for doing
Mark Wielaard 4fb41b
-# "make uninstall".  It removes $(noinst_PROGRAMS) from $prefix/lib/valgrind/.
Mark Wielaard 4fb41b
+# "make uninstall".  It removes $(noinst_PROGRAMS) from $prefix/libexec/valgrind/.
Mark Wielaard 4fb41b
 # It needs to be depended on by an 'uninstall-local' rule.
Mark Wielaard 4fb41b
 uninstall-noinst_PROGRAMS:
Mark Wielaard 4fb41b
 	for f in $(noinst_PROGRAMS); do \
Mark Wielaard 4fb41b
-	  rm -f $(DESTDIR)$(pkglibdir)/$$f; \
Mark Wielaard 4fb41b
+	  rm -f $(DESTDIR)$(pkglibexecdir)/$$f; \
Mark Wielaard 4fb41b
 	done
Mark Wielaard 4fb41b
 
Mark Wielaard 4fb41b
 # Similar to install-noinst_PROGRAMS.
Mark Wielaard 4fb41b
@@ -71,15 +71,15 @@ uninstall-noinst_PROGRAMS:
Mark Wielaard 4fb41b
 # directories.  XXX: not sure whether the resulting permissions will be
Mark Wielaard 4fb41b
 # correct when using 'cp -R'...
Mark Wielaard 4fb41b
 install-noinst_DSYMS: build-noinst_DSYMS
Mark Wielaard 4fb41b
-	$(mkinstalldirs) $(DESTDIR)$(pkglibdir); \
Mark Wielaard 4fb41b
+	$(mkinstalldirs) $(DESTDIR)$(pkglibexecdir); \
Mark Wielaard 4fb41b
 	for f in $(noinst_DSYMS); do \
Mark Wielaard 4fb41b
-	  cp -R $$f.dSYM $(DESTDIR)$(pkglibdir); \
Mark Wielaard 4fb41b
+	  cp -R $$f.dSYM $(DESTDIR)$(pkglibexecdir); \
Mark Wielaard 4fb41b
 	done
Mark Wielaard 4fb41b
 
Mark Wielaard 4fb41b
 # Similar to uninstall-noinst_PROGRAMS.
Mark Wielaard 4fb41b
 uninstall-noinst_DSYMS:
Mark Wielaard 4fb41b
 	for f in $(noinst_DSYMS); do \
Mark Wielaard 4fb41b
-	  rm -f $(DESTDIR)$(pkglibdir)/$$f.dSYM; \
Mark Wielaard 4fb41b
+	  rm -f $(DESTDIR)$(pkglibexecdir)/$$f.dSYM; \
Mark Wielaard 4fb41b
 	done
Mark Wielaard 4fb41b
 
Mark Wielaard 4fb41b
 # This needs to be depended on by a 'clean-local' rule.
Mark Wielaard 4fb41b
diff --git a/Makefile.am b/Makefile.am
Mark Wielaard 4fb41b
index 242b38a..3b7c806 100644
Mark Wielaard 4fb41b
--- a/Makefile.am
Mark Wielaard 4fb41b
+++ b/Makefile.am
Mark Wielaard 4fb41b
@@ -58,7 +58,7 @@ DEFAULT_SUPP_FILES = @DEFAULT_SUPP@
Mark Wielaard 4fb41b
 # default.supp, as it is built from the base .supp files at compile-time.
Mark Wielaard 4fb41b
 dist_noinst_DATA = $(SUPP_FILES)
Mark Wielaard 4fb41b
 
Mark Wielaard 4fb41b
-vglibdir = $(pkglibdir)
Mark Wielaard 4fb41b
+vglibdir = $(pkglibexecdir)
Mark Wielaard 4fb41b
 vglib_DATA = default.supp
Mark Wielaard 4fb41b
 
Mark Wielaard 4fb41b
 pkgconfigdir = $(libdir)/pkgconfig
Mark Wielaard 4fb41b
diff --git a/coregrind/Makefile.am b/coregrind/Makefile.am
Mark Wielaard 4fb41b
index 94030fd..f09763a 100644
Mark Wielaard 4fb41b
--- a/coregrind/Makefile.am
Mark Wielaard 4fb41b
+++ b/coregrind/Makefile.am
Mark Wielaard 4fb41b
@@ -11,12 +11,12 @@ include $(top_srcdir)/Makefile.all.am
Mark Wielaard 4fb41b
 
Mark Wielaard 4fb41b
 AM_CPPFLAGS_@VGCONF_PLATFORM_PRI_CAPS@ += \
Mark Wielaard 4fb41b
 	-I$(top_srcdir)/coregrind \
Mark Wielaard 4fb41b
-	-DVG_LIBDIR="\"$(pkglibdir)"\" \
Mark Wielaard 4fb41b
+	-DVG_LIBDIR="\"$(pkglibexecdir)"\" \
Mark Wielaard 4fb41b
 	-DVG_PLATFORM="\"@VGCONF_ARCH_PRI@-@VGCONF_OS@\""
Mark Wielaard 4fb41b
 if VGCONF_HAVE_PLATFORM_SEC
Mark Wielaard 4fb41b
 AM_CPPFLAGS_@VGCONF_PLATFORM_SEC_CAPS@ += \
Mark Wielaard 4fb41b
 	-I$(top_srcdir)/coregrind \
Mark Wielaard 4fb41b
-	-DVG_LIBDIR="\"$(pkglibdir)"\" \
Mark Wielaard 4fb41b
+	-DVG_LIBDIR="\"$(pkglibexecdir)"\" \
Mark Wielaard 4fb41b
 	-DVG_PLATFORM="\"@VGCONF_ARCH_SEC@-@VGCONF_OS@\""
Mark Wielaard 4fb41b
 endif
Mark Wielaard 4fb41b
 
Mark Wielaard 4fb41b
@@ -714,7 +714,7 @@ GDBSERVER_XML_FILES = \
Mark Wielaard 4fb41b
 	m_gdbserver/mips64-fpu.xml
Mark Wielaard 4fb41b
 
Mark Wielaard 4fb41b
 # so as to make sure these get copied into the install tree
Mark Wielaard 4fb41b
-vglibdir = $(pkglibdir)
Mark Wielaard 4fb41b
+vglibdir = $(pkglibexecdir)
Mark Wielaard 4fb41b
 vglib_DATA  = $(GDBSERVER_XML_FILES)
Mark Wielaard 4fb41b
 
Mark Wielaard 4fb41b
 # so as to make sure these get copied into the tarball
Mark Wielaard 4fb41b
diff --git a/mpi/Makefile.am b/mpi/Makefile.am
Mark Wielaard 4fb41b
index 7ad9a25..471fee0 100644
Mark Wielaard 4fb41b
--- a/mpi/Makefile.am
Mark Wielaard 4fb41b
+++ b/mpi/Makefile.am
Mark Wielaard 4fb41b
@@ -18,16 +18,18 @@ EXTRA_DIST = \
Mark Wielaard 4fb41b
 # libmpiwrap-<platform>.so
Mark Wielaard 4fb41b
 #----------------------------------------------------------------------------
Mark Wielaard 4fb41b
 
Mark Wielaard 4fb41b
-noinst_PROGRAMS  =
Mark Wielaard 4fb41b
+# These are really real libraries, so they should go to libdir, not libexec.
Mark Wielaard 4fb41b
+mpidir = $(pkglibdir)
Mark Wielaard 4fb41b
+mpi_PROGRAMS  =
Mark Wielaard 4fb41b
 if BUILD_MPIWRAP_PRI
Mark Wielaard 4fb41b
-noinst_PROGRAMS += libmpiwrap-@VGCONF_ARCH_PRI@-@VGCONF_OS@.so
Mark Wielaard 4fb41b
+mpi_PROGRAMS += libmpiwrap-@VGCONF_ARCH_PRI@-@VGCONF_OS@.so
Mark Wielaard 4fb41b
 endif
Mark Wielaard 4fb41b
 if BUILD_MPIWRAP_SEC
Mark Wielaard 4fb41b
-noinst_PROGRAMS += libmpiwrap-@VGCONF_ARCH_SEC@-@VGCONF_OS@.so
Mark Wielaard 4fb41b
+mpi_PROGRAMS += libmpiwrap-@VGCONF_ARCH_SEC@-@VGCONF_OS@.so
Mark Wielaard 4fb41b
 endif
Mark Wielaard 4fb41b
 
Mark Wielaard 4fb41b
 if VGCONF_OS_IS_DARWIN
Mark Wielaard 4fb41b
-noinst_DSYMS = $(noinst_PROGRAMS)
Mark Wielaard 4fb41b
+mpi_DSYMS = $(mpi_PROGRAMS)
Mark Wielaard 4fb41b
 endif
Mark Wielaard 4fb41b
 
Mark Wielaard 4fb41b