|
From: <sv...@va...> - 2012-02-21 15:58:13
|
Author: tom Date: 2012-02-21 15:53:35 +0000 (Tue, 21 Feb 2012) New Revision: 12396 Log: Hide our use of pkglibdir to stop automake 1.11.2 and later complaining. Modified: trunk/Makefile.am trunk/coregrind/Makefile.am Modified: trunk/Makefile.am =================================================================== --- trunk/Makefile.am 2012-02-21 11:03:38 UTC (rev 12395) +++ trunk/Makefile.am 2012-02-21 15:53:35 UTC (rev 12396) @@ -51,7 +51,8 @@ # default.supp, as it is built from the base .supp files at compile-time. dist_noinst_DATA = $(SUPP_FILES) -pkglib_DATA = default.supp +vglibdir = $(pkglibdir) +vglib_DATA = default.supp pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = valgrind.pc Modified: trunk/coregrind/Makefile.am =================================================================== --- trunk/coregrind/Makefile.am 2012-02-21 11:03:38 UTC (rev 12395) +++ trunk/coregrind/Makefile.am 2012-02-21 15:53:35 UTC (rev 12396) @@ -513,7 +513,8 @@ m_gdbserver/powerpc-altivec64l.xml # so as to make sure these get copied into the install tree -pkglib_DATA = $(GDBSERVER_XML_FILES) +vglibdir = $(pkglibdir) +vglib_DATA = $(GDBSERVER_XML_FILES) # so as to make sure these get copied into the tarball EXTRA_DIST += $(GDBSERVER_XML_FILES) |