|
From: <sv...@va...> - 2009-06-15 06:26:33
|
Author: njn Date: 2009-06-15 07:25:49 +0100 (Mon, 15 Jun 2009) New Revision: 10333 Log: Get rid of $(valdir); it's equivalent to the built-in $(pkglibdir). Modified: branches/BUILD_TWEAKS/Makefile.all.am branches/BUILD_TWEAKS/coregrind/Makefile.am Modified: branches/BUILD_TWEAKS/Makefile.all.am =================================================================== --- branches/BUILD_TWEAKS/Makefile.all.am 2009-06-15 06:19:59 UTC (rev 10332) +++ branches/BUILD_TWEAKS/Makefile.all.am 2009-06-15 06:25:49 UTC (rev 10333) @@ -6,7 +6,6 @@ # Global stuff #---------------------------------------------------------------------------- -valdir = $(libdir)/valgrind inplacedir = $(top_builddir)/.in_place @@ -61,9 +60,9 @@ # It needs to be depended on by an 'install-exec-local' rule. install-noinst_PROGRAMS: if [ -n "$(noinst_PROGRAMS)" ] ; then \ - $(mkinstalldirs) $(DESTDIR)$(valdir); \ + $(mkinstalldirs) $(DESTDIR)$(pkglibdir); \ for f in $(noinst_PROGRAMS); do \ - $(INSTALL_PROGRAM) $$f $(DESTDIR)$(valdir); \ + $(INSTALL_PROGRAM) $$f $(DESTDIR)$(pkglibdir); \ done ; \ fi @@ -73,9 +72,9 @@ # correct when using 'cp -R'... install-noinst_DSYMS: build-noinst_DSYMS if [ -n "$(noinst_DSYMS)" ] ; then \ - $(mkinstalldirs) $(DESTDIR)$(valdir); \ + $(mkinstalldirs) $(DESTDIR)$(pkglibdir); \ for f in $(noinst_DSYMS); do \ - cp -R $$f.dSYM $(DESTDIR)$(valdir); \ + cp -R $$f.dSYM $(DESTDIR)$(pkglibdir); \ done ; \ fi Modified: branches/BUILD_TWEAKS/coregrind/Makefile.am =================================================================== --- branches/BUILD_TWEAKS/coregrind/Makefile.am 2009-06-15 06:19:59 UTC (rev 10332) +++ branches/BUILD_TWEAKS/coregrind/Makefile.am 2009-06-15 06:25:49 UTC (rev 10333) @@ -12,12 +12,12 @@ AM_CPPFLAGS_@VGCONF_PLATFORM_PRI_CAPS@ += \ -I$(top_srcdir)/coregrind \ - -DVG_LIBDIR="\"$(valdir)"\" \ + -DVG_LIBDIR="\"$(pkglibdir)"\" \ -DVG_PLATFORM="\"@VGCONF_ARCH_PRI@-@VGCONF_OS@\"" if VGCONF_HAVE_PLATFORM_SEC AM_CPPFLAGS_@VGCONF_PLATFORM_SEC_CAPS@ += \ -I$(top_srcdir)/coregrind \ - -DVG_LIBDIR="\"$(valdir)"\" \ + -DVG_LIBDIR="\"$(pkglibdir)"\" \ -DVG_PLATFORM="\"@VGCONF_ARCH_SEC@-@VGCONF_OS@\"" endif @@ -441,7 +441,7 @@ # tools. install-exec-local: install-noinst_PROGRAMS install-noinst_DSYMS for v in $(LIBVEX) ; do \ - $(INSTALL_DATA) @VEX_DIR@/$$v $(DESTDIR)$(valdir) ; \ + $(INSTALL_DATA) @VEX_DIR@/$$v $(DESTDIR)$(pkglibdir) ; \ done |